Handling taps better by tracking if we've moved..