Almost there with shapes·