mid-refactor of data models
data refactor almost complete