Refactoring to move funtions into climates as appropriate.