Import Wave 7

Also implemented the "not with Hugh" restriction for the previous wave.