BAM!  Refactored.