965798 product map

This cleans up a bunch of hard-coded product stuff to now use the product table.

r?