Did a bit more work on the commander.