split some things out of world into core