Touch type now has own class