Get notes working
Rework oh so very many things
Update references
Many changes
Various fixes