Mackey Changes and added things to the command_map