Refactoring: added data model and a DataStore class. List object are no longer strings.