Inheritance refactor
Fix touch input