Core now works.
Tests passed and timings are OK.