Adding tap, shake, and orientation