major overall of model organization and more admin development