Working on moving data model and refactoring.