introducing thermostats, commented out calls to missing files
fixed merge conflict