A bit more work on the command system.