Rc1/better promise

Hey tests pass now hurrah. Okay three fail but they're failing on master too and i wanna get this merged in.