Added contours and rectangles, hyiaaaahhh!!