first pass to try fixing the touch interactions