Graphs are being drawn ...

Start rewrite to create more reusable components