started implementation of resend logic - needs testing