Lots of revamping of the way paths are handled.