Arthur's commit after struggling with add new product
arthur's second attempt for the day to merge everything