master commit before localstorage impl branch