Program reorganization, settings pulled up to base class, removed as a class item