There are no other blockers from my side.  Just this.  Do you think you will be able to circle back at some time to do the refactoring?  I'm just worried about taking a step backwards on this and not getting around to fixing it.