significant refactor of settings. Some functionality commented out