Cleanup + explicit tests.
Implement Sturdy