Finish everything except notetaking
Finish. For real. Everything that's here works. 1 or 2 small things were cut but it is done
Merge with master