Lacking a few tests, but now with collision detection