rework how paths are tracked, simplify a lot