wip
WIP adding deferreds to call in order
few scoping changes