Working on models.
Intermediate commit.
hey there
Fixed data issue.