Add hourglass/galaxy circulate and general matchers.
Add O/butterfly concepts and general matchers.

We still need to smooth the transition in/out of the formation.