WIP and tests on core