refactor stuff
More work on commands
Make it actually do something.