fixes build problem
refactors to touch movement, only collitions remain to refactor