Intermediate Checkin.  Failing Tests!  Mid-Refactoring in prep for compression helper.