Rework notes again.  We need special handling for notes greater than 32KB