Added promises to everything