Hi Daniel Carlson! This is the plan and has been the priority for the past 18 months. Most of this has been behind the scenes to ensure a smooth transition. It will be a little bit longer before everything is replaced, but you will be seeing some big changes over the next few months.