yay moar shapes