Refactor  "StreamReader" out

pretty much a necessary precursor to trying to make the map display
actually work