Jesse/collab edit

Import this on the same line as notes.