Some changes on TouchHandler and a test class, to try the TouchHandler