Added initial save feature