Adding fat finger checking and unit tests!