WIP: getting working dir right