start final refactor thermo activity
complete thermo refactoring