Fix curve, move Cd and S
Mass rename, integration.
Basically done integrating.

Also added convection and radiation and solar heating
Merging rework