Implemented the first iteration of saving