Spec'd. I also changed my solution from writing this spec. Much simpler now -- less changes.