Start of refactoring/rewriting commandset handler, again?!? hahahahaha... ha.. ha. .... ha..augh
Yet another refactoring. Hopefully the last for the command set handler