add some device-state mechinism to FS to allow tracking of device-specific states where they may have more than one call from the same device
don't need this change revert