Add NoteMaker and tests.