rework of logic, hopefully will work for this subset of users then can expand to other subsets before further expanding user prefs