More work towards path finding. #2, 83c1ece