Massive refactor to make model behave homogeneously for all levels of model