Notes
Flesh out tests