Cleaned up and condensed the property view model.  The amount of OOP in
the inner classes of the model was making it hard to understand.