Mucho changes

Heat scaling is in.  Some Changes for new XML.