Actually return a promise.. as promised..