Change to using use-package and bind-key? Mostly untested