Started porting to vertex implementation