Added more TODO items for the promises implementation