Working updating graph in graph-test; changed organization of code. Now need to apply same work to formatted-host.