Splitting out the global into core