Experimental: Don't invoke cwd() so often
 ugh conflict