move some variables onto thermo