Updated to newest core, this commit jsut fixes the initial build errors. May not actually work yet.