more tweaks and refactoring
neater approach to graph construction
further...
more refactoring, including of router
demo start