Made the shapes slide more-or-less work.