Path first pass WIP