diff --git a/public/js/us-counties.js b/public/js/us-counties.js
diff --git a/public/js/us-states.js b/public/js/us-states.js
diff --git a/wolfram.py b/wolfram.py
@@ -114,7 +114,7 @@ def SocioEconomicQuery(self, query):
 			a_dict = {'location': query, 'county': county, 'income': income}
 			incomes.append(a_dict)
 			# print incomes
-			with open('incomes.json', 'w') as f:
+			with open('incomes2.json', 'w') as f:
 				json.dump(incomes, f)
 
 			# print 'success'
@@ -138,9 +138,11 @@ def SocioEconomicQuery(self, query):
 	with open('hospitals_louisiana.json') as data_file:    
 		data = json.load(data_file)
 
-	for i in range(0, len(data)):
+	for i in range(1661, len(data)):
 		city = data[i]['location']
+		# print city
 		cities.append(city)
+		# raw_input()
 
 	for j in range(0, len(cities)):
 		wolfram.SocioEconomicQuery(cities[j])

diff --git a/wolfram_2.py b/wolfram_2.py
@@ -0,0 +1,199 @@
+#utf-8
+
+import wolframalpha
+import us
+import mechanize
+import json
+import urllib
+import urllib2
+import time
+from geopy.geocoders import Nominatim
+
+app_id = 'GYXL99-Q2HRYVVQRX'
+# client = wolframalpha.Client(app_id)
+
+states = ["Alabama", "Alaska", "Arizona", "Arkansas", "California", "Colorado", "Connecticut", "Washington-DC", "Delaware", "Florida", "Georgia", 
+          "Hawaii", "Idaho", "Illinois", "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana", "Maine", "Maryland", 
+          "Massachusetts", "Michigan", "Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada", "New-Hampshire", "New-Jersey", 
+          "New-Mexico", "New-York", "North-Carolina", "North-Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode-Island", "South-Carolina", 
+          "South-Dakota", "Tennessee", "Texas", "Utah", "Vermont", "Virginia", "Washington", "West-Virginia", "Wisconsin", "Wyoming"]
+
+hospitals = []
+incomes = []
+
+class Wolfram:
+	def __init__(self):
+		self.br = mechanize.Browser()
+		self.br.set_handle_robots(False)
+		self.base = 'http://www.ushospital.info/'
+		self.br.open(self.base)
+
+	def AccessState(self, i):
+		name = states[i]
+		url = self.base + name + ".htm"
+		self.br.open(url)
+		html = self.br.response().read()
+		nums = html.split('<li>')[1:]
+
+		for num in nums:
+			name = str(self.GetHospitalName(num))
+			self.HospitalQuery(name)
+			# print len(hospitals)
+
+	def GetHospitalName(self,html):
+		num1 = html.find('<a href') 
+		numStart = html.find('">', num1) + len('">')
+		numEnd = html.find('</a>', numStart)
+		return html[numStart:numEnd].strip()
+
+	def HospitalQuery(self, query):
+		url = 'http://api.wolframalpha.com/v2/query?appid=GYXL99-Q2HRYVVQRX&input=' + urllib.quote(query) + '&format=plaintext'
+		html = urllib2.urlopen(url).read()
+		if "<queryresult success='true'" in html:
+
+			if "<pod title='Input interpretation'" in html and "<pod title='Location'" in html: 
+				num1 = html.find("<pod title='Input interpretation'")
+				numStart = html.find('<plaintext>', num1) + len('<plaintext>')
+				numEnd = html.find('</plaintext>', numStart)
+				name = html[numStart:numEnd].strip()
+
+				num1 = html.find("<pod title='Location'")		
+				numStart = html.find('<plaintext>', num1) + len('<plaintext>')
+				numEnd = html.find('</plaintext>', numStart)
+				location = html[numStart:numEnd].strip()
+
+				a_dict = {'name': name, 'location': location}
+				hospitals.append(a_dict)
+				# print hospitals
+				with open('hospitals.json', 'w') as f:
+					json.dump(hospitals, f)
+
+				# print 'success'
+				print len(hospitals)
+
+		else:
+			# print 'fail'
+			print len(hospitals)
+
+	def SocioEconomicQuery(self, query):
+	 	url = 'http://api.wolframalpha.com/v2/query?appid=GYXL99-Q2HRYVVQRX&input=' + urllib.quote(query) + '&format=plaintext&scantimeout=20'
+	 	# print url
+	 	# time.sleep(10)
+		html = urllib2.urlopen(url).read()
+		if "<queryresult success='true'" in html:
+			if "<pod title='County'" in html:
+				num1 = html.find("<pod title='County'")
+			elif "<pod title='Counties'" in html:
+				num1 = html.find("<pod title='Counties'")
+			else:
+				return
+
+			numStart = html.find('<plaintext>', num1) + len('<plaintext>')
+			numEnd = html.find('</plaintext>', numStart)
+			county = html[numStart:numEnd].strip()
+
+			url = 'http://api.wolframalpha.com/v2/query?appid=GYXL99-Q2HRYVVQRX&input=' + urllib.quote(query) + 'median household Income' '&format=plaintext&scantimeout=20'
+		 	# print url
+
+			if "<pod title='Income statistics'" in html: 
+				num1 = html.find("<pod title='Income statistics'")		
+				num2 = html.find('<plaintext>', num1) + len('<plaintext>')
+				numStart = html.find('median household income | $', num2) + len('median household income | $')
+				numEnd = html.find(' per year', numStart)
+				income = html[numStart:numEnd].strip()
+
+			else:
+				# time.sleep(10)
+				url = 'http://api.wolframalpha.com/v2/query?appid=GYXL99-Q2HRYVVQRX&input=' + urllib.quote(county) + '&format=plaintext&scantimeout=20'
+				# print url
+				html = urllib2.urlopen(url).read()
+				if "<pod title='Income statistics'" in html: 
+					num1 = html.find("<pod title='Income statistics'")		
+					num2 = html.find('<plaintext>', num1) + len('<plaintext>')
+					numStart = html.find('median household income | $', num2) + len('median household income | $')
+					numEnd = html.find(' per year', numStart)
+					income = html[numStart:numEnd].strip()
+
+			a_dict = {'location': query, 'county': county, 'income': income}
+			incomes.append(a_dict)
+			# print incomes
+			with open('incomes.json', 'w') as f:
+				json.dump(incomes, f)
+
+			# print 'success'
+			print len(incomes)
+
+		else:
+			# print 'fail'
+			print len(incomes)
+		# raw_input()
+
+
+if __name__ == '__main__':
+	wolfram = Wolfram()
+
+	# for i in range(0,50):
+	# 	wolfram.AccessState(i)
+	# 	print ('finished state')
+
+	# cities = []
+
+	# with open('hospitals_louisiana.json') as data_file:    
+	# 	data = json.load(data_file)
+
+	# for i in range(0, len(data)):
+	# 	city = data[i]['location']
+	# 	cities.append(city)
+
+	# for j in range(0, len(cities)):
+	# 	wolfram.SocioEconomicQuery(cities[j])
+
+	# counties = []
+
+	# # with open ('counties.json') as file1:
+	# data1 = json.load(open('counties.json', 'r'), encoding='ISO-8859-1')
+	# print len(data1['features'])
+
+	# with open ('incomes.json') as file2:
+	# 	data2 = json.load(file2)
+
+	# for i in range(0, len(data1['features'])):
+	# 	for j in range (0, len(data2)):
+	# 		# print data1['features'][i]['properties']['NAME'], data2[j]['county']
+	# 		if data1['features'][i]['properties']['NAME'] in data2[j]['county']:
+	# 			print 'yes'
+	# 			data1['features'][i]['properties']['income'] = data2[j]['income']
+	# 			continue
+	# 	print 'no'
+	# 	# raw_input()
+	# 	# raw_input()
+	# # print hospitals
+	# with open('counties3.json', 'w') as outfile:
+	# 	json.dump(data1, outfile)
+
+	latlng = []
+
+	with open ('hospitals_full.json') as data_file:
+		data = json.load(data_file)
+		# print len()
+
+
+	for i in range(0, len(data)):
+		geolocator = Nominatim()
+		# print data[i]['location']
+		location = geolocator.geocode(data[i]['location'])
+
+		# print((location.latitude, location.longitude))
+		if location is not None: 
+			latlng.append([location.latitude, location.longitude])
+
+		print i
+		# print latlng
+		# raw_input()
+
+	with open('latlng.json', 'w') as outfile:
+		json.dump(latlng, outfile)
+
+
+	print ('done!')
+