Began working on UI and added data model