Refactor/trim some more things, add back env vars
Make parser accept contextDir
Removing dclient, making sure everything respects the context dir