(#38) graph controller reorganization (w.i.p.)