added cells: circles and rectangles (and circle inside rectangle) only so far