hmm
collision detection now works
more collision changes, making it kinda trippy