Refactored note persistence
  *Has been integrated into app_rebuild, and then Master, by hand (James Hulley driving)