Basically done integrating.

Also added convection and radiation and solar heating