Updated the command class. Lots to do still.