another big update

changing functionality to suit the needs of the settings level