Added barriers.  Still have to be implemented for collisions.