Finishing up refactor for rollout