Completed Chapter 2 - Entities