Collision for more props

Collision stuff, should be the last of it