Wrote preliminary cwd.
Merge branch 'brownyoda' into cevans
Pwd looks like it might work.