Finished a major refactor around the keypad including some abstraction.