There are some manifest changes here from a commit russel gave me. Otherwise, standard SROA things...