iteration 3

Shape/Color check, not working yet(WIP)