Collisions

Merge up boundary collision functionality