Updating Develop.core to current Develop Baseline

Tested OK with now issues.

Need to review Core base against changes to see if more classes can be moved into core