More work on graph layers.
Continuing to evolve ideas; also cleaned up TODOs.