WIP: Cleaning up the Start command.