Finished Exercise 2 open tasks and modified RowStore