wip
Goodbye Command-T, hello CTRL-P