Continuing along with collision code, which is very annoying. Commiting before I have to go out for a little bit.