refactor some stuff, prep for push to pull elsewhere
Merge branch 'master' of https://github.com/timm-allman/Notes-Notes-Notes-