Revert "Approach to settings logic." - Not appliying yet.

This reverts commit 76c5f2c75b0da57bb08f05ab673537d84edd1ebe.