More product class prepwork