Rewriting touch class and delegates to be simple c++ pass through structs with more state options, tap count, timestamp, button number.