Beginning to add save/load for core