Backout latest work
Add init test
Make it pass
Add 2nd test; Make it pass
Refactor