Continue work on data model for exercises