This MR satisfies the upgrades for Issue #75 (closed). This MR satisfies the feature toggles for Issue #76 (closed)