Seasons branch getting merged in

Restructuring to fit design in issue #27