Prep to be able to set notes more flexibly.
Merge branch 'dev-integration2' of github.com:alexhenning/wpi-suite-tng into dev-integration2