toucn controls done, physics refactor