tidy
tmp: working on parsing paths directly