Inserted into a map slightly differently.
Fixed dumb compilation error with semicolon.
Merge branch 'sam_2156_env_stuff' into sam_2156_env_ii
Merge branch 'sam_2156_env_ii' into sam_2156