First round of refacts to add full product table to DB