Start work on getting commands into their own classes.
foo