graph
some more stuff
tweaks
detemplatized