graphmapper detail is fubar'd
pre-merging broken back into main