Moved touch controls to a separate class