Start moving commands into their own classes :)