Moved commands into it's own subclass.