Finished savefile rewrite