First draw of command inputs
Merge remote-tracking branch 'refs/remotes/ben/helios' into helios
Command and key binding refactoring