Manage settings2

Merge attempt into master branch.  This branch contains all changes that were made in the mergeSettings branch.