Major changes to environments.
Including many new diagrams