This stuff is still evolving -- and I've put it on pause to make progress on graph generation -- but I had these edits in my enlistment and didn't want to lose them.