Starting to hack in some env var configuration goodness