Cleaning up the send options and making the delay a first class citizen.
Also added a temp hook that will solve #1363 in the short term