Update: notes and crossed off todo #2