Integrate new core

This PR is for tracking the tests failing as we integrate the new core. When the tests pass we'll merge it into master.