Ronas branch

Merging Rona's notes into main branch.