updated my branch, bringing in the settings class