Refactor in progress to use notes2 data structure