Refactoring touch system. WIP