Still improving Dijkstras implementation, going to bed for the night