Moved commands to a more abstract system, cleaned them up, etc.
Now going to start going through and do more cleaning.