Collision updated

still in progress but its what I've got so far.