Can now draw rectangles and added colours