Making some of the notes inline cc @meggin