Jeremy

New Merge: Has updated testing that works for the new system.  Contains Edge and Vertex Location holders