Possibly ready for 2.0.0, needs testing.
The (not ready) Utilities file update
Preparation for 2.0.0
Small tidy up
Prep for 2.0.0