Wow.  Much refactor.  So clean.