dijkstra now instance of abstract walk; added prim
merge with patty's changes