MOAR work on core