WIP; refactor pathing