Now to rewire a few other classes due to this refractor