Getting things ready for prod rollout