ellipses still messed up.  Rectangles working