Wrap some more keyboard functions
Flesh out the timer wrapper