Partially Overhauled Commands

Partially overhauled our command classes. There's still some work to be done but we're almost there. See commits for details.