MOAR work on new core integration