Functions now given resolve instead of deferred