Adds keypad and adds refactor scripts