Still broken, implementing 2D collisions

Testing pull requests.