Key watch

Recreated the branch to be cleaner and leaner