Work on making the command system a little better