Started moving stuff to environment variables