Final commit - all done. Finished observer code and fixed some bugs with products
