Added in product table, fixed up a bunch of things