Added loads of changes to the core

YES TO THE CORE