Go for it. I went ahead and merged because tests pass, but more work is needed to make this clean.