Updated object model.  Stable for algorithm development.