Shouldn't we be returning a promise of some sort here?