[WIP] Trying to setup a simple setup/rollback system.
Make it green again.

  * Pending work on a better factory class.