strategy for detecting edge collisions

progress checkin from this machine