dijkstras working, some little structural changing - more will follow