new command system. I think it works correctly.. heh.