+1 to waiting to refactor until we need it.