pulling in latest
conflict
refactor for passing a dir as a path