Multi-touch refactored and working