More promises unwrapped

Signed-off-by: Rob Simpson <rsimpson2@me.com>