The substance of Figure Three refactor is done.