North Bay Regional Changes
Renamed classes for consistency; added two stub modes
Formatting