Work on better collisions.

WARNING: It crashes now. At least, on my computer it does.