Almost done collisions

but shit is still broken, sorry ;x too tired