more work on suspend/retry
continuing work on model