Refactored commands. They now all start with cmd_