Update (WIP) Environment.cpp