More work on creating core