Broken build, attempt at class restoration