Changing for updated plan.
Adding everything from options into one branch so that way we can make the adjustments we need since we are opting out of using non-sharded options.
Adding everything from options into one branch so that way we can make the adjustments we need since we are opting out of using non-sharded options.