Began rewrite of command manager (untested)