Overhaul of the command system. Untested.