Feature/product completed

Complete