RF: First step towards decoupling config and estimation.