Started adding User model for hotkey management and did a few little refactorings.