Add retry logic

misc other changes, including 7 day availability window, and adding ePID as other Identifier on OnDemands
//TODO?

Can we do this now by seeing if it's of type `Item` and if not throwing? Or is it more complex than that?