Add first draft
Add tests