WIP, saving env back