Probably working mostly ish
Tweaks/additions to style notes