Bring Core up to speed with Andrew's project.