#335 Fixed swirling, committing in case my next steps are messy.