queries complete, graphs complete, needs final testing