Saving progress

Change-Id: I5294d2c98691393c768b02ed7471d9622079622f