Merged Tyler's collisions code and smoothed it out