Added notes so we have a merge conflict for @eed3si9n to deal with.