99 Bugs

Refactoring without unit tests… sigh!