Add client_environment
Use _ rather than -
Add memory comment, add TODO