in case of accidents
MAJOR CODE MERGE: working collision detection, touch countrols (not tested), and ready for deployment