Graphing Logic Working

Terser code - type safe