Preparing for use in Foundation.
Adding some automation
No errors
Addressing warnings
More addressing of warnings
Corrected automated stuff
More automation corrections