Somewhat working collision

Still fixes needed :(