Thiny bit more work on the commands.