Did some work on agent class to include locations in multiple environments.