moved everything else into the settings file