trying collisions again.
Merge branch 'Refine-Animations'