Rewrote parsers
Rewrote note operations for new parser