massive overhaul, reverting to tap, swipe deconstruction