MOAR work on new core