Feature/product completed