Began building functionality into the data model, now using inheritance.