Rewrite + tests
1.0.0