Added timeout on HttpClient and Moved over to our actual database.