Added includes, needs Vertex.h