Initial Edit User preferences work started. All commented out now, should not be used in demo