Started working on Hotkey Management
tst commit