Core compiles now (but will break)