Corgi-Break reborn.  WIth Unit Tests.