capture changes

capture changes.  will be abandoning this branch and will pursue memento
pattern