Moved the commands into the main class as else it can get into a mess without adding some form of actual command managment system.