commiting dijkstra stuff, still unfinished