Update to work, and use env vars for it's config