Added a missing .h file in our .pch. Restructured the saving code.