Completed M1 Launchpad Milestone Refactoring