Refactored to stick methods in different files which I think will make a more straightforward CLI structure possible.