Compiling again after huge refactor