added simple collision detection and some TODO stuff