Reworked how environment variables are set. Maybe this will work...?