Shifted loads of items around to make the separation of the CLI and MVC easier to see