More refactor
Trying to figure out collision detection and resolution, not working so
well.