major refactoring, model-adding, navigation-building, massive-thinking