Refactor mainline #242

Open matthewlewis112 opened 3 years ago