Updated environments to include type. This is needed for calculating savings
Cleanup
merged