More work on the path finding stuff