Start adding retry/Nak logic