working on image upload
resolved merge conflicts on pieces model