Refactoring to require less system knowledge

This refactoring may look a bit backwards. Ultimately, I'm looking
towards creating a class that can handle the two persistence questions:

    * Do I look as expected
    * Did I change as expected