last bits and pieces, all should be promises now