Sounds maybe
Review some TODOs
Remove key bindings (TBD)