First stab at a more intuitive UI for touch interactions. See #33