More progress on collision. Still not working.

Needs a refactor... badly