Added some initial deferred changes...

Not sure if this is going to be the right way to do it, though.
Merge branch 'send-deferred' into dev