fixup! allow passing in working dir and split out arg parsing