Core integrate

Oops did it the wrong way round...