DO NOT MERGE
Not going to go down this route right now, but want to save this for when we upgrade to vega 5.
This change is