Use promises style syntax
Rename to make a bit more sense