Fix the command system. I've been meaning to do this for years.