Chapter 6 - Finish the Model and Data modules