Added notes
WIP: moving to new paradigm