Tidied the view models.  Although I extended the use of the accessors, I'd probably be happier just using the instance variables directly.  I may change that later...