Finally fixed all the build errors, now we can actually test and code and stuff