command mappings and better command system