Update (WIP) Environment.hpp