Continued work on creating the core