consolidating models and their moving parts in anticipation of integration with allauth