second try, margin notes, first commit