Flesh out Notes functionality, & work on docblocks