Implemented Saving (Still not finished)