up: lazy big commit, working on data model.