Refactoring. Now using VertexStruct