I broke things while making shapes better.