Swirling Along

I fixed a small counting mistake and made more progress.  Still looks rather amorphous.