Vertex Class - TODOs added