I would prefer to see billing brought into the CP. One stop shopping...