TODO
Quicker Command-T, mappings, status line and other changes