Adds lot of command classes
some of the fixes