Still need to finish turning test_notes.md into proper tests, but I think I'm ready to merge.