draws squares and ellipses now too