Converted to Task so I can add API.