Work towards better collisions

WARNING: Collisions with walls don’t work