Starting to integrate touch into standalone version