Added a bunch of more SubCommands along with some refactoring.