Added some more meat to the command manager