Restructure
Allow overriding
Restructure
VertexHandler and formatting