More collision

Doesn't work as planned for surfaces yet, to be fixed.