First round of changes
Finished adding support for null state
Merge branch 'nullClimate'