Fixed and tested the data collection logic.  the keypad can accept a
pattern input or tapping input (not both combined though)