Some more changes... The whole command system has to be rewritten at this point