Remembered what I was doing, and also improved encapsulation in the Model class.