#12 Got the environment working again after the previous round of cleanup