diff --git a/data/borders.csv b/data/borders.csv
index 4e93734..f773ba7 100644
--- a/data/borders.csv
+++ b/data/borders.csv
@@ -1,180 +1,180 @@
 name,latitude,longitude
-gift,76.17449795,-99.53613281
-gift,74.36667479,-96.87011719
-gift,74.62510096,-125.0830078
-gift,76.36226182,-117.6855469
-gift,76.59854507,-112.3828125
-north,74.36667479,-96.87011719
-north,74.62510096,-125.0830078
-north,74.05579888,-140.2880859
-north,71.20191973,-153.8232422
-north,64.86760782,-151.7138672
-north,65.92855384,-158.1298828
-north,59.73425345,-162.3486328
-north,53.8784404,-153.4716797
-north,46.34692761,-161.0302734
-north,43.61221677,-158.1298828
-north,45.61403741,-144.5947266
-north,40.68063803,-136.3330078
-north,43.73935208,-119.8974609
-north,53.8784404,-113.3056641
-north,50.81981826,-111.1962891
-north,52.24125615,-100.1220703
-north,58.28639548,-96.60644531
-north,57.35023748,-84.47753906
-north,59.62332522,-90.234375
-north,65.71255746,-93.88183594
-north,67.50856836,-82.98339844
-north,71.34301347,-80.30273438
-north,72.90672343,-82.58789063
-north,76.47577254,-78.046875
-north,77.76758238,-80.94726563
-north,78.59529919,-88.06640625
-north,77.7861905,-91.66992188
-north,75.58493741,-90.43945313
-north,74.18805166,-87.01171875
-north,73.35305494,-95.94726563
-riverlands,40.68063803,-136.3330078
-riverlands,43.73935208,-119.8974609
-riverlands,43.03677586,-117.7001953
-riverlands,36.98500309,-119.4580078
-riverlands,23.84564989,-109.7900391
-riverlands,21.41216223,-104.3408203
-riverlands,17.76961225,-100.6933594
-riverlands,13.62463344,-108.9550781
-riverlands,2.240639609,-112.1191406
-riverlands,6.271618064,-125.4345703
-riverlands,11.13528708,-135.7177734
-riverlands,16.9307051,-136.4208984
-riverlands,27.56672143,-134.1357422
-riverlands,31.46615372,-129.0380859
-riverlands,35.06597314,-130.6201172
-riverlands,32.65787574,-137.5634766
-riverlands,35.99578539,-139.0576172
-riverlands,38.30718056,-133.9599609
-vale,43.03677586,-117.7001953
-vale,36.98500309,-119.4580078
-vale,23.84564989,-109.7900391
-vale,21.41216223,-104.3408203
-vale,19.02057711,-101.7480469
-vale,20.38582538,-92.56347656
-vale,30.10711789,-78.58886719
-vale,32.54681317,-77.84179688
-vale,32.69486598,-87.20214844
-vale,36.38591277,-80.52246094
-vale,43.35713822,-80.7421875
-vale,48.92249926,-83.33496094
-vale,49.6391772,-106.7138672
-vale,48.34164617,#VALUE!
-iron,29.80251791,-143.1884766
-iron,33.46810796,-144.6826172
-iron,35.53222623,-147.7587891
-iron,35.38904997,-150.6591797
-iron,33.32134853,-157.8662109
-iron,29.68805275,-157.9101563
-iron,26.62781823,-155.4492188
-iron,26.90247689,-149.8242188
-westerlands,6.271618064,-125.4345703
-westerlands,11.13528708,-135.7177734
-westerlands,16.9307051,-136.4208984
-westerlands,27.56672143,-134.1357422
-westerlands,26.15543797,-147.3632813
-westerlands,24.046464,-148.3300781
-westerlands,22.39071392,-146.3525391
-westerlands,16.46769475,-152.6806641
-westerlands,5.834616166,-159.0966797
-westerlands,6.184246161,-152.3291016
-westerlands,-4.696879027,-155.9326172
-westerlands,-7.580327791,-155.8007813
-westerlands,-6.140554782,-144.9902344
-westerlands,-4.521666343,-139.2773438
-westerlands,-3.688855143,-127.8955078
-crownlands,17.76961225,-100.6933594
-crownlands,13.62463344,-108.9550781
-crownlands,2.240639609,-112.1191406
-crownlands,-4.346411275,-104.4287109
-crownlands,-3.864254616,-89.31152344
-crownlands,5.222246513,-84.91699219
-crownlands,9.145486056,-87.37792969
-crownlands,13.45373721,-83.42285156
-crownlands,19.68397024,-81.31347656
-crownlands,25.12539261,-82.45605469
-crownlands,18.02052766,-93.09082031
-crownlands,18.93746443,-97.66113281
-reach,-7.580327791,-155.8007813
-reach,-6.140554782,-144.9902344
-reach,-4.521666343,-139.2773438
-reach,-3.688855143,-127.8955078
-reach,6.271618064,-125.4345703
-reach,2.240639609,-112.1191406
-reach,-4.346411275,-104.4287109
-reach,-9.188870084,-110.3613281
-reach,-18.93746443,-109.7900391
-reach,-24.20688962,-128.1152344
-reach,-27.99440141,-130.1367188
-reach,-32.47269502,-138.3984375
-reach,-41.86956083,-140.4638672
-reach,-44.96479793,-140.4638672
-reach,-47.12995076,-148.4619141
-reach,-50.42951795,-156.6357422
-reach,-48.3708477,-159.0087891
-reach,-44.93369639,-158.8769531
-reach,-37.99616268,-150.6591797
-reach,-39.87601942,-155.1855469
-reach,-38.65119833,-157.9980469
-reach,-34.27083595,-159.0966797
-reach,-28.69058765,-155.2294922
-reach,-28.61345942,-152.9003906
-reach,-20.67390526,-152.3291016
-reach,-18.0623123,-149.6484375
-reach,-16.63619188,-153.0761719
-reach,-10.83330598,-156.1083984
-stormlands,-4.346411275,-104.4287109
-stormlands,-4.346411275,-104.4287109
-stormlands,-9.188870084,-110.3613281
-stormlands,-18.93746443,-109.7900391
-stormlands,-24.20688962,-128.1152344
-stormlands,-27.99440141,-130.1367188
-stormlands,-30.14512718,-127.5878906
-stormlands,-27.05912578,-111.8115234
-stormlands,-29.03696065,-107.5927734
-stormlands,-28.65203063,-93.88183594
-stormlands,-30.75127778,-91.46484375
-stormlands,-28.80617351,-82.10449219
-stormlands,-21.12549764,-79.73144531
-stormlands,-19.97334879,-82.1484375
-stormlands,-19.43551434,-94.36523438
-stormlands,-17.39257927,-94.54101563
-stormlands,-16.97274102,-90.05859375
-stormlands,-12.94032213,-88.4765625
-stormlands,-9.838979376,-89.97070313
-stormlands,-10.27168123,-84.9609375
-stormlands,-13.53920067,-84.609375
-stormlands,-15.58071074,-83.203125
-stormlands,-15.83453574,-80.78613281
-stormlands,-12.42584778,-79.37988281
-stormlands,-9.492408154,-81.48925781
-stormlands,-7.188100871,-84.91699219
-stormlands,-4.390228926,-83.95019531
-stormlands,-2.679686616,-87.90527344
-stormlands,-3.864254616,-89.31152344
-dorne,-44.96479793,-140.4638672
-dorne,-41.86956083,-140.4638672
-dorne,-32.47269502,-138.3984375
-dorne,-27.99440141,-130.1367188
-dorne,-30.14512718,-127.5878906
-dorne,-27.05912578,-111.8115234
-dorne,-29.03696065,-107.5927734
-dorne,-36.27970721,-114.6240234
-dorne,-36.73888412,-106.7578125
-dorne,-34.84987503,-104.9121094
-dorne,-36.98500309,-104.6923828
-dorne,-38.78834536,-90.89355469
-dorne,-35.63944107,-83.73046875
-dorne,-35.3532161,-81.40136719
-dorne,-37.82280243,-78.94042969
-dorne,-41.4756602,-80.390625
-dorne,-47.5468716,-89.44335938
-dorne,-49.95121991,-134.1796875
-dorne,-48.2831929,-137.6513672
-dorne,-44.02442152,-138.0908203
\ No newline at end of file
+Gift,76.17449795,-99.53613281
+Gift,74.36667479,-96.87011719
+Gift,74.62510096,-125.0830078
+Gift,76.36226182,-117.6855469
+Gift,76.59854507,-112.3828125
+The_North,74.36667479,-96.87011719
+The_North,74.62510096,-125.0830078
+The_North,74.05579888,-140.2880859
+The_North,71.20191973,-153.8232422
+The_North,64.86760782,-151.7138672
+The_North,65.92855384,-158.1298828
+The_North,59.73425345,-162.3486328
+The_North,53.8784404,-153.4716797
+The_North,46.34692761,-161.0302734
+The_North,43.61221677,-158.1298828
+The_North,45.61403741,-144.5947266
+The_North,40.68063803,-136.3330078
+The_North,43.73935208,-119.8974609
+The_North,53.8784404,-113.3056641
+The_North,50.81981826,-111.1962891
+The_North,52.24125615,-100.1220703
+The_North,58.28639548,-96.60644531
+The_North,57.35023748,-84.47753906
+The_North,59.62332522,-90.234375
+The_North,65.71255746,-93.88183594
+The_North,67.50856836,-82.98339844
+The_North,71.34301347,-80.30273438
+The_North,72.90672343,-82.58789063
+The_North,76.47577254,-78.046875
+The_North,77.76758238,-80.94726563
+The_North,78.59529919,-88.06640625
+The_North,77.7861905,-91.66992188
+The_North,75.58493741,-90.43945313
+The_North,74.18805166,-87.01171875
+The_North,73.35305494,-95.94726563
+Riverlands,40.68063803,-136.3330078
+Riverlands,43.73935208,-119.8974609
+Riverlands,43.03677586,-117.7001953
+Riverlands,36.98500309,-119.4580078
+Riverlands,23.84564989,-109.7900391
+Riverlands,21.41216223,-104.3408203
+Riverlands,17.76961225,-100.6933594
+Riverlands,13.62463344,-108.9550781
+Riverlands,2.240639609,-112.1191406
+Riverlands,6.271618064,-125.4345703
+Riverlands,11.13528708,-135.7177734
+Riverlands,16.9307051,-136.4208984
+Riverlands,27.56672143,-134.1357422
+Riverlands,31.46615372,-129.0380859
+Riverlands,35.06597314,-130.6201172
+Riverlands,32.65787574,-137.5634766
+Riverlands,35.99578539,-139.0576172
+Riverlands,38.30718056,-133.9599609
+Vale_of_Arryn,43.03677586,-117.7001953
+Vale_of_Arryn,36.98500309,-119.4580078
+Vale_of_Arryn,23.84564989,-109.7900391
+Vale_of_Arryn,21.41216223,-104.3408203
+Vale_of_Arryn,19.02057711,-101.7480469
+Vale_of_Arryn,20.38582538,-92.56347656
+Vale_of_Arryn,30.10711789,-78.58886719
+Vale_of_Arryn,32.54681317,-77.84179688
+Vale_of_Arryn,32.69486598,-87.20214844
+Vale_of_Arryn,36.38591277,-80.52246094
+Vale_of_Arryn,43.35713822,-80.7421875
+Vale_of_Arryn,48.92249926,-83.33496094
+Vale_of_Arryn,49.6391772,-106.7138672
+Vale_of_Arryn,48.34164617,-110.5371094
+Iron_Islands,29.80251791,-143.1884766
+Iron_Islands,33.46810796,-144.6826172
+Iron_Islands,35.53222623,-147.7587891
+Iron_Islands,35.38904997,-150.6591797
+Iron_Islands,33.32134853,-157.8662109
+Iron_Islands,29.68805275,-157.9101563
+Iron_Islands,26.62781823,-155.4492188
+Iron_Islands,26.90247689,-149.8242188
+Westerlands,6.271618064,-125.4345703
+Westerlands,11.13528708,-135.7177734
+Westerlands,16.9307051,-136.4208984
+Westerlands,27.56672143,-134.1357422
+Westerlands,26.15543797,-147.3632813
+Westerlands,24.046464,-148.3300781
+Westerlands,22.39071392,-146.3525391
+Westerlands,16.46769475,-152.6806641
+Westerlands,5.834616166,-159.0966797
+Westerlands,6.184246161,-152.3291016
+Westerlands,-4.696879027,-155.9326172
+Westerlands,-7.580327791,-155.8007813
+Westerlands,-6.140554782,-144.9902344
+Westerlands,-4.521666343,-139.2773438
+Westerlands,-3.688855143,-127.8955078
+Crownlands,17.76961225,-100.6933594
+Crownlands,13.62463344,-108.9550781
+Crownlands,2.240639609,-112.1191406
+Crownlands,-4.346411275,-104.4287109
+Crownlands,-3.864254616,-89.31152344
+Crownlands,5.222246513,-84.91699219
+Crownlands,9.145486056,-87.37792969
+Crownlands,13.45373721,-83.42285156
+Crownlands,19.68397024,-81.31347656
+Crownlands,25.12539261,-82.45605469
+Crownlands,18.02052766,-93.09082031
+Crownlands,18.93746443,-97.66113281
+The_Reach,-7.580327791,-155.8007813
+The_Reach,-6.140554782,-144.9902344
+The_Reach,-4.521666343,-139.2773438
+The_Reach,-3.688855143,-127.8955078
+The_Reach,6.271618064,-125.4345703
+The_Reach,2.240639609,-112.1191406
+The_Reach,-4.346411275,-104.4287109
+The_Reach,-9.188870084,-110.3613281
+The_Reach,-18.93746443,-109.7900391
+The_Reach,-24.20688962,-128.1152344
+The_Reach,-27.99440141,-130.1367188
+The_Reach,-32.47269502,-138.3984375
+The_Reach,-41.86956083,-140.4638672
+The_Reach,-44.96479793,-140.4638672
+The_Reach,-47.12995076,-148.4619141
+The_Reach,-50.42951795,-156.6357422
+The_Reach,-48.3708477,-159.0087891
+The_Reach,-44.93369639,-158.8769531
+The_Reach,-37.99616268,-150.6591797
+The_Reach,-39.87601942,-155.1855469
+The_Reach,-38.65119833,-157.9980469
+The_Reach,-34.27083595,-159.0966797
+The_Reach,-28.69058765,-155.2294922
+The_Reach,-28.61345942,-152.9003906
+The_Reach,-20.67390526,-152.3291016
+The_Reach,-18.0623123,-149.6484375
+The_Reach,-16.63619188,-153.0761719
+The_Reach,-10.83330598,-156.1083984
+Stormlands,-4.346411275,-104.4287109
+Stormlands,-4.346411275,-104.4287109
+Stormlands,-9.188870084,-110.3613281
+Stormlands,-18.93746443,-109.7900391
+Stormlands,-24.20688962,-128.1152344
+Stormlands,-27.99440141,-130.1367188
+Stormlands,-30.14512718,-127.5878906
+Stormlands,-27.05912578,-111.8115234
+Stormlands,-29.03696065,-107.5927734
+Stormlands,-28.65203063,-93.88183594
+Stormlands,-30.75127778,-91.46484375
+Stormlands,-28.80617351,-82.10449219
+Stormlands,-21.12549764,-79.73144531
+Stormlands,-19.97334879,-82.1484375
+Stormlands,-19.43551434,-94.36523438
+Stormlands,-17.39257927,-94.54101563
+Stormlands,-16.97274102,-90.05859375
+Stormlands,-12.94032213,-88.4765625
+Stormlands,-9.838979376,-89.97070313
+Stormlands,-10.27168123,-84.9609375
+Stormlands,-13.53920067,-84.609375
+Stormlands,-15.58071074,-83.203125
+Stormlands,-15.83453574,-80.78613281
+Stormlands,-12.42584778,-79.37988281
+Stormlands,-9.492408154,-81.48925781
+Stormlands,-7.188100871,-84.91699219
+Stormlands,-4.390228926,-83.95019531
+Stormlands,-2.679686616,-87.90527344
+Stormlands,-3.864254616,-89.31152344
+Dorne,-44.96479793,-140.4638672
+Dorne,-41.86956083,-140.4638672
+Dorne,-32.47269502,-138.3984375
+Dorne,-27.99440141,-130.1367188
+Dorne,-30.14512718,-127.5878906
+Dorne,-27.05912578,-111.8115234
+Dorne,-29.03696065,-107.5927734
+Dorne,-36.27970721,-114.6240234
+Dorne,-36.73888412,-106.7578125
+Dorne,-34.84987503,-104.9121094
+Dorne,-36.98500309,-104.6923828
+Dorne,-38.78834536,-90.89355469
+Dorne,-35.63944107,-83.73046875
+Dorne,-35.3532161,-81.40136719
+Dorne,-37.82280243,-78.94042969
+Dorne,-41.4756602,-80.390625
+Dorne,-47.5468716,-89.44335938
+Dorne,-49.95121991,-134.1796875
+Dorne,-48.2831929,-137.6513672
+Dorne,-44.02442152,-138.0908203
\ No newline at end of file
diff --git a/data/houses.csv b/data/houses.csv
index 2e3be42..255d0d2 100644
--- a/data/houses.csv
+++ b/data/houses.csv
@@ -1,13 +1,13 @@
 wikiKey,seatKey,lat,lng,img,clue,isGreat,firstChapter,lastChapter,firstEpisode,lastEpisode
-Night%27s_Watch,Castle_Black,,,black_flag.png,,TRUE,0,999,,
+Night%27s_Watch,Castle_Black,,,http://awoiaf.westeros.org/images/thumb/4/47/Minigdn.png/109px-Minigdn.png,,TRUE,,,,
 House_Stark,Winterfell,,,http://awoiaf.westeros.org/images/thumb/5/51/House_Stark.PNG/90px-House_Stark.PNG,,TRUE,0,118,0,14
 House_Greyjoy,Winterfell,,,http://awoiaf.westeros.org/images/thumb/f/f3/Greyjoy_coat_sigil.png/120px-Greyjoy_coat_sigil.png,,TRUE,119,138,15,18
-House_Bolton,Dreadfort,,,http://awoiaf.westeros.org/images/thumb/7/76/Bolton.png/50px-Bolton.png,,FALSE,0,195,,
+House_Bolton,Dreadfort,,,http://awoiaf.westeros.org/images/thumb/7/76/Bolton.png/50px-Bolton.png,,FALSE,0,195,0,18
 House_Bolton,Dreadfort,,,http://awoiaf.westeros.org/images/thumb/7/76/Bolton.png/50px-Bolton.png,,TRUE,196,307,19,41
 House_Bolton,Winterfell,,,http://awoiaf.westeros.org/images/thumb/7/76/Bolton.png/50px-Bolton.png,,TRUE,308,999,42,57
 House_Bolton,Dreadfort,,,http://awoiaf.westeros.org/images/thumb/7/76/Bolton.png/50px-Bolton.png,,FALSE,308,999,42,99
 House_Stark,Winterfell,,,http://awoiaf.westeros.org/images/thumb/5/51/House_Stark.PNG/90px-House_Stark.PNG,,TRUE,999,999,58,99
-House_Tully,Riverrun,,,http://awoiaf.westeros.org/images/thumb/2/23/House_Tully.PNG/112px-House_Tully.PNG,,TRUE,0,137,,
+House_Tully,Riverrun,,,http://awoiaf.westeros.org/images/thumb/2/23/House_Tully.PNG/112px-House_Tully.PNG,,TRUE,0,137,0,99
 House_Tully,Riverrun,,,http://awoiaf.westeros.org/images/thumb/2/23/House_Tully.PNG/112px-House_Tully.PNG,,FALSE,138,268,99,99
 House_Baelish_of_Harrenhal,Harrenhal,,,http://awoiaf.westeros.org/images/thumb/1/13/House_Baelish.PNG/90px-House_Baelish.PNG,,TRUE,138,999,99,99
 House_Arryn,Eyrie,,,http://awoiaf.westeros.org/images/thumb/b/be/House_Arryn.PNG/112px-House_Arryn.PNG,,TRUE,,,,
@@ -97,7 +97,7 @@ House_Bracken,Stone_Hedge,,,http://awoiaf.westeros.org/images/thumb/5/53/Bracken
 House_Butterwell,,16.7835,-107.285,http://awoiaf.westeros.org/images/thumb/a/a1/House_Butterwell.png/109px-House_Butterwell.png,the Riverlands,,,,,
 House_Charlton,,35.7465,-123.853,http://awoiaf.westeros.org/images/thumb/c/c1/Charlton.png/109px-Charlton.png,the Riverlands,,,,,
 House_Frey,Twins,,,http://awoiaf.westeros.org/images/thumb/3/3b/House_Frey.png/109px-House_Frey.png,,,,,,
-House_Frey_of_Riverrun,Riverrun,,,http://awoiaf.westeros.org/images/thumb/3/3b/House_Frey.png/109px-House_Frey.png,,,269,999,,
+House_Frey_of_Riverrun,Riverrun,,,http://awoiaf.westeros.org/images/thumb/3/3b/House_Frey.png/109px-House_Frey.png,,,269,999,999,999
 House_Goodbrook,Goodbrook_Village,,,http://awoiaf.westeros.org/images/thumb/9/95/House_Goodbrook.PNG/103px-House_Goodbrook.PNG,,,,,,
 House_Grell,,21.4121,-133.784,http://awoiaf.westeros.org/images/thumb/b/b7/House_Grell.PNG/50px-House_Grell.PNG,the Riverlands,,,,,
 House_Hawick,Saltpans,,,http://awoiaf.westeros.org/images/thumb/0/09/Hawick.png/50px-Hawick.png,,,,,,
@@ -116,10 +116,10 @@ House_Vance_of_Atranta,,28.2656,-119.282,http://awoiaf.westeros.org/images/thumb
 House_Vance_of_Wayfarer%27s_Rest,Wayfarer%27s_Rest,,,http://awoiaf.westeros.org/images/thumb/0/01/House_Vance_of_Wayfarer%27s_rest.PNG/50px-House_Vance_of_Wayfarer%27s_rest.PNG,,,,,,
 House_Vypren,,13.0259,-134.048,http://awoiaf.westeros.org/images/thumb/b/b5/Vyprin.png/50px-Vyprin.png,the Riverlands,,,,,
 House_Wayn,,14.1365,-121.304,http://awoiaf.westeros.org/images/thumb/d/df/House_Wayn.PNG/109px-House_Wayn.PNG,the Riverlands,,,,,
-House_Darry,Darry,,,http://awoiaf.westeros.org/images/thumb/2/22/House_Darry.png/50px-House_Darry.png,,,0,999,,
-House_Harroway,Harrenhal,,,http://awoiaf.westeros.org/images/thumb/7/77/Harroway.png/109px-Harroway.png,,,0,137,,
-House_Whent,Harrenhal,,,http://awoiaf.westeros.org/images/thumb/6/6d/House_Whent.png/50px-House_Whent.png,,,0,79,0,0
-House_Slynt,Harrenhal,,,http://awoiaf.westeros.org/images/thumb/e/ea/House_Slynt.PNG/110px-House_Slynt.PNG,,,57,80,0,0
+House_Darry,Darry,,,http://awoiaf.westeros.org/images/thumb/2/22/House_Darry.png/50px-House_Darry.png,,,,,,
+House_Harroway,Harrenhal,,,http://awoiaf.westeros.org/images/thumb/7/77/Harroway.png/109px-Harroway.png,,,0,137,0,99
+House_Whent,Harrenhal,,,http://awoiaf.westeros.org/images/thumb/6/6d/House_Whent.png/50px-House_Whent.png,,,0,79,-1,-1
+House_Slynt,Harrenhal,,,http://awoiaf.westeros.org/images/thumb/e/ea/House_Slynt.PNG/110px-House_Slynt.PNG,,,57,80,-1,-1
 House_Algood,,1.5379,-148.462,http://awoiaf.westeros.org/images/thumb/8/88/Algood.png/93px-Algood.png,the Westerlands,,,,,
 House_Banefort,Banefort,,,http://awoiaf.westeros.org/images/thumb/a/ac/Banefort.png/50px-Banefort.png,,,,,,
 House_Bettley,,2.3723,-129.565,http://awoiaf.westeros.org/images/thumb/6/6b/Bettley.png/50px-Bettley.png,the Westerlands,,,,,
@@ -132,7 +132,7 @@ House_Estren,,25.6415,-142.837,http://awoiaf.westeros.org/images/thumb/2/27/Hous
 House_Falwell,,12.5545,-141.958,http://awoiaf.westeros.org/images/thumb/f/fe/Falwell.png/109px-Falwell.png,the Westerlands,,,,,
 House_Farman,Faircastle,,,http://awoiaf.westeros.org/images/thumb/8/83/Farman.png/50px-Farman.png,,,,,,
 House_Ferren,,-1.4939,-140.024,http://awoiaf.westeros.org/images/thumb/5/52/Ferren.png/250px-Ferren.png,the Westerlands,,,,,
-House_Foote,,-0.9667,-133.433,http://awoiaf.westeros.org/images/thumb/0/0c/House_Foote.PNG/50px-House_Foote.PNG,the Westerlands,,,,,
+House_Foote,,-0.9667,-133.433,http://awoiaf.westeros.org/images/thumb/0/0c/House_Foote.PNG/100px-House_Foote.PNG,the Westerlands,,,,,
 House_Garner,,-0.8788,-150.703,http://awoiaf.westeros.org/images/thumb/b/b7/House_Garner.PNG/101px-House_Garner.PNG,the Westerlands,,,,,
 House_Hamell,,2.8113,-134.268,http://awoiaf.westeros.org/images/thumb/6/6c/Hamell.PNG/250px-Hamell.PNG,the Westerlands,,,,,
 House_Jast,,9.6224,-154.746,http://awoiaf.westeros.org/images/thumb/4/4d/House_Jast.PNG/90px-House_Jast.PNG,the Westerlands,,,,,
@@ -225,8 +225,8 @@ Nute,Lord_Hewett%27s_Town,,,http://awoiaf.westeros.org/images/thumb/5/5c/Coats_o
 House_Serry,,-22.35,-150.249,http://awoiaf.westeros.org/images/thumb/e/ed/House_Serry.PNG/50px-House_Serry.PNG,,,0,253,,
 Andrik,,-22.35,-150.249,http://awoiaf.westeros.org/images/thumb/5/5c/Coats_of_arms_of_None.png/100px-Coats_of_arms_of_None.png,,,254,999,,
 House_Dondarrion,Blackhaven,,,http://awoiaf.westeros.org/images/thumb/1/1d/Dondarrion.png/55px-Dondarrion.png,,,,,,
-House_Caron,Nightsong,,,http://awoiaf.westeros.org/images/thumb/6/64/House_Caron.png/105px-House_Caron.png,,,0,137,,
-House_Foote_of_Nightsong,Nightsong,,,http://awoiaf.westeros.org/images/thumb/0/0c/House_Foote.PNG/90px-House_Foote.PNG,,,138,999,,
+House_Caron,Nightsong,,,http://awoiaf.westeros.org/images/thumb/6/64/House_Caron.png/105px-House_Caron.png,,,0,137,0,99
+House_Foote_of_Nightsong,Nightsong,,,http://awoiaf.westeros.org/images/thumb/0/0c/House_Foote.PNG/100px-House_Foote.PNG,,,138,999,-1,-1
 House_Swann,Stonehelm,,,http://awoiaf.westeros.org/images/thumb/a/a9/House_Swann.PNG/50px-House_Swann.PNG,,,,,,
 House_Bolling,,-20.3858,-104.502,http://awoiaf.westeros.org/images/thumb/6/66/House_Bolling.PNG/109px-House_Bolling.PNG,the Stormlands,,,,,
 House_Buckler,Bronzegate,,,http://awoiaf.westeros.org/images/thumb/8/81/House_Buckler.png/50px-House_Buckler.png,,,,,,
@@ -261,7 +261,7 @@ House_Seaworth,,-23.8054,-83.3203,http://awoiaf.westeros.org/images/thumb/9/99/S
 House_Allyrion,Godsgrace,,,http://awoiaf.westeros.org/images/thumb/2/25/House_Allyrion.PNG/120px-House_Allyrion.PNG,,,,,,
 House_Blackmont,Blackmont,,,http://awoiaf.westeros.org/images/thumb/f/f9/Blackmont.png/120px-Blackmont.png,,,,,,
 House_Dalt,Lemonwood,,,http://awoiaf.westeros.org/images/thumb/f/fb/DaltCoA.png/50px-DaltCoA.png,,,,,,
-House_Dayne,Starfall,,,http://awoiaf.westeros.gr/images/b/b7/Dayne_coat_sigil.png,,,,,,
+House_Dayne,Starfall,,,http://awoiaf.westeros.org/images/thumb/1/15/DayneCoA.png/120px-DayneCoA.png,,,,,,
 House_Dayne_of_High_Hermitage,High_Hermitage,,,http://awoiaf.westeros.org/images/thumb/5/5c/Coats_of_arms_of_None.png/100px-Coats_of_arms_of_None.png,,,,,,
 House_Fowler,Skyreach,,,http://awoiaf.westeros.org/images/thumb/0/06/House_Fowler.png/90px-House_Fowler.png,,,,,,
 House_Gargalen,Salt_Shore,,,http://awoiaf.westeros.org/images/thumb/7/75/House_Gargalen.png/120px-House_Gargalen.png,,,,,,
diff --git a/data/locations.csv b/data/locations.csv
deleted file mode 100644
index 16fe3c9..0000000
--- a/data/locations.csv
+++ /dev/null
@@ -1,246 +0,0 @@
-key,region,latitude,longitude,title,awoiaf
-Westwatch-by-the-Bridge,Numbered Locations,76.36226182,-117.6855469,1: Westwatch-by-the-Bridge,
-Shadow_Tower,Numbered Locations,76.37261948,-116.5429688,2: Shadow Tower,
-Sentinel_Stand,Numbered Locations,76.38296943,-115.1367188,3: Sentinel Stand,
-Greyguard,Numbered Locations,76.31035754,-113.7744141,4: Greyguard,
-Stonedoor,Numbered Locations,76.42429214,-112.4560547,5: Stonedoor,
-Hoarfrost_Hill,Numbered Locations,76.39331166,-111.5332031,6: Hoarfrost Hill,
-Icemark,Numbered Locations,76.37261948,-110.4345703,7: Icemark,
-Nightfort,Numbered Locations,76.33114247,-109.5556641,8: Nightfort,
-Deep_Lake,Numbered Locations,76.28954162,-108.8525391,9: Deep Lake,
-Queensgate,Numbered Locations,76.27912202,-107.8857422,10: Queensgate,
-Castle_Black,Numbered Locations,76.26869465,-106.6992188,11: Castle Black,
-Oakenshield_(Wall),Numbered Locations,76.20596704,-105.7324219,12: Oakensheild,
-Woodswatch-by-the-Pool,Numbered Locations,76.18499546,-104.8974609,13: Woodswatch-by-the-Pool,
-Sable_Hall,Numbered Locations,76.16399262,-103.7109375,14: Sable Hall,
-Rimegate,Numbered Locations,76.11134844,-102.4804688,15: Rimegate,
-Long_Barrow,Numbered Locations,76.12189296,-101.6894531,16: Long Barrow,
-Torches,Numbered Locations,76.06909176,-100.8105469,17: Torches,
-Greenguard,Numbered Locations,76.03731658,-100.1513672,18: Greenguard,
-Eastwatch-by-the-Sea,Numbered Locations,76.17449795,-99.53613281,19: Eastwatch-by-the-Sea,Eastwatch-by-the-Sea
-BWB_Hideout,Numbered Locations,25.24469595,-117.8173828,20: Brotherhood Without Banners hideout,A_Feast_for_Crows-Chapter_42
-Inn_of_the_Kneeling_Man,Numbered Locations,25.00597266,-122.2998047,21: Inn of the Kneeling Man,
-Lord_Harroway%27s_Town,Numbered Locations,23.03929775,-114.4775391,22: Lord Harroway's Town,
-They_Lay_With_Lions,Numbered Locations,23.40276491,-126.2548828,23: Inn (They Lay with Lions),A_Storm_of_Swords-Chapter_1
-Unnamed_Village,Numbered Locations,22.59372606,-122.6953125,24: Unnamed village,
-Lychester_Keep,Numbered Locations,21.94304553,-123.2666016,25: Lord Lychester's Keep,House_Lychester
-Lady_of_the_Leaves,Numbered Locations,20.42701281,-125.4638672,26: Lady of the Leaves,
-Sallydance,Numbered Locations,19.60119416,-124.8925781,27: Sallydance,
-Goodbrook_Village,Numbered Locations,19.2696653,-123.046875,28: Lord Goodbrook's Village,House_Goodbrook#A_Song_of_Ice_and_Fire
-Pennytree,Numbered Locations,20.22096578,-119.7949219,29: Pennytree,
-Old_Stone_Bridge,Numbered Locations,5.790896813,-100.8105469,30: Old Stone Bridge Inn,
-Lord_Hewett%27s_Town,Numbered Locations,-21.00247105,-150.0292969,31: Lord Hewett's Town,
-Shandystone,Numbered Locations,-42.45588764,-92.19726563,32: Shandystone,
-Fist_of_the_First_Men,The North & Beyond,78.27373666,-116.9311523,,
-Craster%27s_Keep,The North & Beyond,77.51837381,-111.5258789,,
-Whitetree,The North & Beyond,76.74543604,-109.5043945,,
-Hardhome,The North & Beyond,78.72061466,-97.15576172,,
-Mole%27s_Town,The North & Beyond,76.00015574,-106.6918945,,
-Queenscrown,The North & Beyond,75.22506492,-109.5043945,,
-Last_Hearth,The North & Beyond,72.62025182,-104.6923828,,
-Karhold,The North & Beyond,70.33353336,-88.16894531,,
-Deepwood_Motte,The North & Beyond,70.18510275,-138.5302734,,
-Dreadfort,The North & Beyond,67.42436395,-102.5830078,,
-Tumbledown_Tower,The North & Beyond,67.75939813,-124.8193359,,
-Winterfell,The North & Beyond,66.24916311,-123.3251953,,
-Castle_Cerwyn,The North & Beyond,65.38514722,-123.3251953,,
-Hornwood,The North & Beyond,63.52897054,-106.1865234,,
-Stony_Shore,The North & Beyond,62.66405507,-160.0195313,,
-Torrhen%27s_Square,The North & Beyond,62.89521754,-133.9599609,,
-Ramsgate,The North & Beyond,58.83649009,-97.66113281,,
-Widow%27s_Watch,The North & Beyond,57.72761922,-85.88378906,,
-Barrowton,The North & Beyond,57.58655887,-136.5966797,,
-White_Harbor,The North & Beyond,56.68037379,-114.0966797,,
-Moat_Cailin,The North & Beyond,53.8784404,-122.3583984,,
-Oldcastle,The North & Beyond,51.75424007,-109.5263672,,
-Flint%27s_Finger,The North & Beyond,50.03597367,-148.7255859,,
-Greywater_Watch,The North & Beyond,46.10370876,-124.6435547,,
-Execution_Holdfast,The North & Beyond,66.54826346,-122.6220703,,A_Game_of_Thrones-Chapter_1
-Crofters%27_village,The North & Beyond,66.58321726,-125.15625,,
-Donella_Manderly,The North & Beyond,65.09064558,-107.8564453,,
-Sisterton,The Vale,49.35375572,-106.8896484,,
-Coldwater_Burn,The Vale,45.05800144,-95.02441406,,
-House_Baelish,The Vale,43.16512263,-81.13769531,,
-Snakewood,The Vale,41.80407814,-93.09082031,,
-Longbow_Hall,The Vale,39.26628442,-86.93847656,,
-Heart%27s_Home,The Vale,36.7036596,-99.06738281,,
-Strongsong,The Vale,36.84446074,-108.9111328,,
-Old_Anchor,The Vale,33.32134853,-87.72949219,,
-Ironoaks,The Vale,32.21280107,-92.12402344,,
-Runestone,The Vale,32.36140332,-83.07128906,,
-Eyrie,The Vale,31.76553741,-102.4951172,,
-Bloody_Gate,The Vale,29.87875535,-102.9345703,,
-Redfort,The Vale,27.33273514,-95.81542969,,
-Gulltown,The Vale,29.42046034,-84.21386719,,
-Wickenden,The Vale,20.83827781,-96.07910156,,
-Palisade_Village,The Vale,28.03319785,-111.9873047,,A_Storm_of_Swords-Chapter_65
-Castle_Goodbrother,The Iron Islands,31.93351676,-153.4277344,,House_Goodbrother_of_Shatterstone
-Nagga%27s_Hill,The Iron Islands,31.3723991,-154.2626953,,
-Ten_Towers,The Iron Islands,31.3723991,-144.4628906,,
-Hammerhorn,The Iron Islands,30.4676141,-156.1962891,,
-Pebbleton,The Iron Islands,29.55434513,-152.5927734,,
-Pyke,The Iron Islands,27.74188463,-150.6152344,,
-Saltpans,The Riverlands,20.92039691,-105.4833984,,
-Quiet_Isle,The Riverlands,20.28280869,-105.3295898,,
-Maidenpool,The Riverlands,17.64402203,-101.7480469,,
-Twins,The Riverlands,38.59970037,-128.7304688,,
-Seagard,The Riverlands,35.19176697,-129.2578125,,
-Oldstones,The Riverlands,30.92107638,-126.4013672,,
-Fairmarket,The Riverlands,29.17134885,-122.578125,,
-Crossroads_Inn,The Riverlands,23.42292846,-112.6904297,,
-Riverrun,The Riverlands,22.28909642,-128.2910156,,
-Stone_Hedge,The Riverlands,22.0856399,-120.9521484,,
-Darry,The Riverlands,21.84110475,-112.4707031,,
-Raventree_Hall,The Riverlands,19.91138351,-118.6669922,,
-Stone_Mill,The Riverlands,18.79191774,-128.7304688,,
-High_Heart,The Riverlands,18.45876812,-124.6435547,,
-Acorn_Hall,The Riverlands,16.84660511,-125.5224609,,
-Harrenhal,The Riverlands,18.25021998,-114.4042969,,
-Rushing_Falls,The Riverlands,16.53089842,-116.3378906,,
-Pinkmaiden_Castle,The Riverlands,15.4748574,-129.609375,,
-Wayfarer%27s_Rest,The Riverlands,16.86763362,-133.4765625,,
-Wendish_Town,The Riverlands,13.38961959,-131.2792969,,
-Mummer%27s_Ford,The Riverlands,13.94472997,-130.6201172,,
-Sherrer,The Riverlands,13.17577122,-130.5322266,,
-Tumbler%27s_Falls,The Riverlands,12.49021366,-123.1054688,,
-Hollow_Hill,The Riverlands,11.28616077,-128.1152344,,Brotherhood_Without_Banners
-Stoney_Sept,The Riverlands,9.817329187,-125.6542969,,
-Robbed_Sept,The Riverlands,13.02596593,-126.7089844,,A_Storm_of_Swords-Chapter_39
-Gods_Eye_Holdfast,The Riverlands,11.00590446,-114.7998047,,A_Clash_of_Kings-Chapter_14
-Gods_Eye_Village,The Riverlands,13.15437606,-111.5478516,,A_Clash_of_Kings-Chapter_19
-Banefort,The Westerlands,24.60706914,-147.3632813,,
-Nunn%27s_Deep,The Westerlands,22.22809042,-141.9580078,,
-The_Crag,The Westerlands,19.80805413,-147.4072266,,
-Pendric_Hills,The Westerlands,19.60119416,-144.375,,
-Ashemark,The Westerlands,16.84660511,-144.5068359,,
-Castamere,The Westerlands,15.66535418,-147.3193359,,
-Faircastle,The Westerlands,14.3069695,-152.7246094,,
-Golden_Tooth,The Westerlands,14.17918614,-138.6621094,,
-Sarsfield,The Westerlands,10.96276426,-145.1660156,,
-Oxcross,The Westerlands,9.145486056,-148.5058594,,
-Hornvale,The Westerlands,9.058702156,-137.0361328,,
-Kayce,The Westerlands,7.49319647,-156.7675781,,
-Feastfires,The Westerlands,5.397273408,-157.7783203,,
-Casterly_Rock,The Westerlands,6.315298538,-151.3623047,,
-Deep_Den,The Westerlands,5.572249801,-136.2451172,,
-Tarbeck_Hall,The Westerlands,1.669685501,-152.6367188,,
-Clegane%27s_Keep,The Westerlands,1.801460929,-144.4189453,,
-Silverhill,The Westerlands,0.263670944,-138.3544922,,
-Cornfield,The Westerlands,-2.767477951,-146.8798828,,
-Crakehall,The Westerlands,-4.959615025,-154.5703125,,
-Dragonstone,The Crownlands,13.19716452,-85.53222656,,
-Dyre_Den,The Crownlands,21.20745873,-87.15820313,,
-Whispers,The Crownlands,18.52128333,-84.60937,,
-Rook%27s_Rest,The Crownlands,14.09395718,-94.27734375,,
-Antlers,The Crownlands,14.22178863,-103.8574219,,
-Ivy_Inn,The Crownlands,10.22843727,-108.1201172,,A_Clash_of_Kings-Chapter_5
-Sow%27s_Horn,The Crownlands,10.83330598,-106.7138672,,
-Duskendale,The Crownlands,8.624472108,-98.80371094,,
-Brindlewood,The Crownlands,7.44962426,-107.5488281,,
-Stokeworth,The Crownlands,5.747174077,-103.9453125,,
-Rosby,The Crownlands,3.995780513,-102.4951172,,
-Hayford,The Crownlands,3.469557303,-106.9775391,,
-King%27s_Landing,The Crownlands,1.318243057,-105.9960938,,
-Stonedance,The Crownlands,5.309766172,-86.015625,,
-Sharp_Point,The Crownlands,8.32021229,-87.59765625,,
-Tumbleton,The Reach,-4.784468967,-114.7998047,,
-Red_Lake,The Reach,-8.146242825,-145.9130859,,
-Goldengrove,The Reach,-10.96276426,-138.1787109,,
-Bitterbridge,The Reach,-11.04903835,-124.0283203,,
-Old_Oak,The Reach,-14.51978005,-151.4941406,,
-Longtable,The Reach,-14.68988137,-125.2587891,,
-Grassy_Vale,The Reach,-13.06877673,-113.4375,,
-Cider_Hall,The Reach,-18.60460139,-129.7412109,,
-Ashford,The Reach,-20.59165212,-123.0615234,,
-Highgarden,The Reach,-23.96617587,-138.3544922,,
-Bandallon,The Reach,-29.53522956,-154.8339844,,
-Brightwater_Keep,The Reach,-29.99300228,-149.2529297,,
-Horn_Hill,The Reach,-29.72622232,-138.0029297,,
-Honeyholt,The Reach,-32.99023556,-148.2861328,,
-Oldtown,The Reach,-36.6331621,-149.8681641,,
-Blackcrown,The Reach,-38.71980474,-155.3613281,,
-Uplands,The Reach,-37.40507375,-141.4746094,,
-Three_Towers,The Reach,-41.11246879,-152.8125,,
-Sunflower_Hall,The Reach,-45.79816953,-144.5068359,,
-Haystack_Hall,The Stormlands,-7.885147283,-91.77246094,,
-Parchments,The Stormlands,-8.32021229,-85.75195313,,
-Bronzegate,The Stormlands,-8.754794702,-94.49707031,,
-Fawnton,The Stormlands,-10.31491929,-107.8125,,
-Felwood,The Stormlands,-12.12526422,-97.35351563,,
-Evenfall_Hall,The Stormlands,-12.76894644,-83.77441406,,
-Storm%27s_End,The Stormlands,-16.17247281,-91.86035156,,
-Grandview,The Stormlands,-18.14585177,-101.2646484,,
-Griffin%27s_Roost,The Stormlands,-18.43792465,-95.28808594,,
-Summerhall,The Stormlands,-20.01464545,-108.2519531,,
-Rain_House,The Stormlands,-21.12549764,-82.67578125,,
-Crow%27s_Nest,The Stormlands,-22.06527807,-98.23242188,,
-Harvest_Hall,The Stormlands,-21.90227797,-116.1621094,,
-Blackhaven,The Stormlands,-24.20688962,-110.6689453,,
-Stonehelm,The Stormlands,-25.52261465,-102.1875,,
-Mistwood,The Stormlands,-27.56672143,-90.84960938,,
-Greenstone,The Stormlands,-28.49766083,-83.68652344,,
-Weeping_Tower,The Stormlands,-30.22110185,-91.20117188,,
-Nightsong,The Stormlands,-29.07537518,-127.1923828,,
-Wyl_(Dorne),Dorne,-29.19053283,-110.9765625,,
-Vulture%27s_Roost,Dorne,-30.97760909,-122.3144531,,
-Tower_of_Joy,Dorne,-31.95216224,-124.2919922,,
-Kingsgrave,Dorne,-34.81380332,-124.3359375,,
-Blackmont,Dorne,-36.77409249,-132.8613281,,
-High_Hermitage,Dorne,-38.95940879,-132.7294922,,
-Starfall,Dorne,-41.37680857,-135.6298828,,
-Sandstone,Dorne,-44.93369639,-126.9726563,,
-Skyreach,Dorne,-38.75408328,-125.0830078,,
-Hellholt,Dorne,-44.18220396,-117.0849609,,
-Yronwood,Dorne,-37.64903402,-114.4482422,,
-Ghaston_Grey,Dorne,-35.31736633,-105,,
-Vaith,Dorne,-44.59046718,-100.8251953,,
-Tor,Dorne,-38.75408328,-99.85839844,,
-Salt_Shore,Dorne,-46.80005945,-97.04589844,,
-Godsgrace,Dorne,-42.45588764,-96.69433594,,
-Ghost_Hill,Dorne,-39.26628442,-87.55371094,,
-Lemonwood,Dorne,-45.33670191,-86.93847656,,
-Planky_Town,Dorne,-44.0560117,-86.63085938,,
-Sunspear,Dorne,-43.58039086,-84.56542969,,
-Water_Gardens,Dorne,-42.97250159,-84.08203125,,
-Port_of_Ibben,Essos,75.99483914,8.466796875,,
-Braavos,Essos,43.92954994,-59.78027344,,
-Lorath,Essos,39.77476949,-39.38964844,,
-Tyrosh,Essos,-26.70635986,-69.31640625,,
-Lys,Essos,-43.77109382,-56.96777344,,
-Myr,Essos,-23.28171918,-49.18945313,,
-Pentos,Essos,4.083452772,-59.16503906,,
-Ghoyan_Drohe,Essos,7.754537347,-43.828125,,
-Norvos,Essos,19.72534225,-31.34765625,,
-Qohor,Essos,4.477856486,-5.5078125,,
-Ar_Noy,Essos,-3.864254616,-16.84570313,,
-Ny_Sar,Essos,-1.054627942,-29.72167969,,
-Sorrows,Essos,-20.79720143,-22.82226563,,
-Selhorys,Essos,-32.62087018,-19.96582031,,
-Valysar,Essos,-38.34165619,-20.22949219,,
-Volon_Therys,Essos,-41.60722821,-17.32910156,,
-Sar_Mell,Essos,-41.44272638,-15.52734375,,
-Volantis,Essos,-44.37098696,-10.69335938,,
-Mantarys,Essos,-50.73645514,39.31640625,,
-Bhorash,Essos,-46.86019102,61.24511719,,
-Oros,Essos,-64.79284778,36.72363281,,
-Tyria,Essos,-67.05030412,34.83398438,,
-Valyria,Essos,-70.259452,32.41699219,,
-Velos,Essos,-62.36999628,56.89453125,,
-Ghozai,Essos,-58.83649009,55.48828125,,
-Elyria,Essos,-55.65279803,43.93066406,,
-Tolos,Essos,-54.39335222,49.3359375,,
-Meereen,Essos,-45.49094569,80.44921875,,
-Yunkai,Essos,-49.78126406,75.48339844,,
-Astapor,Essos,-58.69977573,71.79199219,,
-Old_Ghis,Essos,-66.63555578,75.26367188,,
-New_Ghis,Essos,-71.92452774,78.99902344,,
-Vaes_Dothrak,Essos,-18.02052766,71.8359375,,
-Lhazar,Essos,-38.27268854,103.3447266,,
-Vaes_Tolorro,Essos,-76.21644112,139.6435547,,
-Dead_City1,Essos,-76.94048839,134.8095703,,Red_Waste#Geography
-Dead_City2,Essos,-77.85109964,125.0537109,,Red_Waste#Geography
-Qarth,Essos,-81.36788549,161.3964844,,
-Zamettar,Sothoryos & The Summer Islands,-79.14653825,70.73730469,,
-Gogossos,Sothoryos & The Summer Islands,-80.78175823,58.21289063,,
-Yeen,Sothoryos & The Summer Islands,-81.01805777,74.82421875,,
-Tall_Trees_Town,Sothoryos & The Summer Islands,-73.50346064,-130.9277344,,
\ No newline at end of file
diff --git a/data/regions.csv b/data/regions.csv
index 608b59e..2cba135 100644
--- a/data/regions.csv
+++ b/data/regions.csv
@@ -1,11 +1,11 @@
-name,color,awoiaf
-gift,#000000,Gift
-north,#808080,The_North
-riverlands,#caffff,Riverlands
-vale,#0368bc,Vale_of_Arryn
-iron,#fffe8b,Iron_Islands
-westerlands,#ffa4a4,Westerlands
-crownlands,#feac77,Crownlands
-reach,#c8ff75,The_Reach
-stormlands,#ffffca,Stormlands
-dorne,#ffe2b7,Dorne
\ No newline at end of file
+key,color
+Gift,#000000
+The_North,#808080
+Riverlands,#caffff
+Vale_of_Arryn,#0368bc
+Iron_Islands,#fffe8b
+Westerlands,#ffa4a4
+Crownlands,#feac77
+The_Reach,#c8ff75
+Stormlands,#ffffca
+Dorne,#ffe2b7
\ No newline at end of file
diff --git a/data/towns.csv b/data/towns.csv
new file mode 100644
index 0000000..bd7237f
--- /dev/null
+++ b/data/towns.csv
@@ -0,0 +1,246 @@
+key,region,latitude,longitude,title,awoiaf
+Westwatch-by-the-Bridge,Numbered Locations,76.36226182,-117.6855469,1: Westwatch-by-the-Bridge,
+Shadow_Tower,Numbered Locations,76.37261948,-116.5429688,2: Shadow Tower,
+Sentinel_Stand,Numbered Locations,76.38296943,-115.1367188,3: Sentinel Stand,
+Greyguard,Numbered Locations,76.31035754,-113.7744141,4: Greyguard,
+Stonedoor,Numbered Locations,76.42429214,-112.4560547,5: Stonedoor,
+Hoarfrost_Hill,Numbered Locations,76.39331166,-111.5332031,6: Hoarfrost Hill,
+Icemark,Numbered Locations,76.37261948,-110.4345703,7: Icemark,
+Nightfort,Numbered Locations,76.33114247,-109.5556641,8: Nightfort,
+Deep_Lake,Numbered Locations,76.28954162,-108.8525391,9: Deep Lake,
+Queensgate,Numbered Locations,76.27912202,-107.8857422,10: Queensgate,
+Castle_Black,Gift,76.26869465,-106.6992188,11: Castle Black,
+Oakenshield_(Wall),Gift,76.20596704,-105.7324219,12: Oakensheild,
+Woodswatch-by-the-Pool,Gift,76.18499546,-104.8974609,13: Woodswatch-by-the-Pool,
+Sable_Hall,Gift,76.16399262,-103.7109375,14: Sable Hall,
+Rimegate,Gift,76.11134844,-102.4804688,15: Rimegate,
+Long_Barrow,Gift,76.12189296,-101.6894531,16: Long Barrow,
+Torches,Gift,76.06909176,-100.8105469,17: Torches,
+Greenguard,Gift,76.03731658,-100.1513672,18: Greenguard,
+Eastwatch-by-the-Sea,Gift,76.17449795,-99.53613281,19: Eastwatch-by-the-Sea,Eastwatch-by-the-Sea
+BWB_Hideout,Riverlands,25.24469595,-117.8173828,20: Brotherhood Without Banners hideout,A_Feast_for_Crows-Chapter_42
+Inn_of_the_Kneeling_Man,Riverlands,25.00597266,-122.2998047,21: Inn of the Kneeling Man,
+Lord_Harroway%27s_Town,Riverlands,23.03929775,-114.4775391,22: Lord Harroway's Town,
+They_Lay_With_Lions,Riverlands,23.40276491,-126.2548828,23: Inn (They Lay with Lions),A_Storm_of_Swords-Chapter_1
+Unnamed_Village,Riverlands,22.59372606,-122.6953125,24: Unnamed village,
+Lychester_Keep,Riverlands,21.94304553,-123.2666016,25: Lord Lychester's Keep,House_Lychester
+Lady_of_the_Leaves,Riverlands,20.42701281,-125.4638672,26: Lady of the Leaves,
+Sallydance,Riverlands,19.60119416,-124.8925781,27: Sallydance,
+Goodbrook_Village,Riverlands,19.2696653,-123.046875,28: Lord Goodbrook's Village,House_Goodbrook#A_Song_of_Ice_and_Fire
+Pennytree,Riverlands,20.22096578,-119.7949219,29: Pennytree,
+Old_Stone_Bridge,Crownlands,5.790896813,-100.8105469,30: Old Stone Bridge Inn,
+Lord_Hewett%27s_Town,The_Reach,-21.00247105,-150.0292969,31: Lord Hewett's Town,
+Shandystone,Dorne,-42.45588764,-92.19726563,32: Shandystone,
+Fist_of_the_First_Men,Beyond_the_Wall,78.27373666,-116.9311523,,
+Craster%27s_Keep,Beyond_the_Wall,77.51837381,-111.5258789,,
+Whitetree,Beyond_the_Wall,76.74543604,-109.5043945,,
+Hardhome,Beyond_the_Wall,78.72061466,-97.15576172,,
+Mole%27s_Town,Gift,76.00015574,-106.6918945,,
+Queenscrown,Gift,75.22506492,-109.5043945,,
+Last_Hearth,The_North,72.62025182,-104.6923828,,
+Karhold,The_North,70.33353336,-88.16894531,,
+Deepwood_Motte,The_North,70.18510275,-138.5302734,,
+Dreadfort,The_North,67.42436395,-102.5830078,,
+Tumbledown_Tower,The_North,67.75939813,-124.8193359,,
+Winterfell,The_North,66.24916311,-123.3251953,,
+Castle_Cerwyn,The_North,65.38514722,-123.3251953,,
+Hornwood,The_North,63.52897054,-106.1865234,,
+Stony_Shore,The_North,62.66405507,-160.0195313,,
+Torrhen%27s_Square,The_North,62.89521754,-133.9599609,,
+Ramsgate,The_North,58.83649009,-97.66113281,,
+Widow%27s_Watch,The_North,57.72761922,-85.88378906,,
+Barrowton,The_North,57.58655887,-136.5966797,,
+White_Harbor,The_North,56.68037379,-114.0966797,,
+Moat_Cailin,The_North,53.8784404,-122.3583984,,
+Oldcastle,The_North,51.75424007,-109.5263672,,
+Flint%27s_Finger,The_North,50.03597367,-148.7255859,,
+Greywater_Watch,The_North,46.10370876,-124.6435547,,
+Execution_Holdfast,The_North,66.54826346,-122.6220703,,A_Game_of_Thrones-Chapter_1
+Crofters%27_village,The_North,66.58321726,-125.15625,,
+Hornwood_Tower,The_North,65.09064558,-107.8564453,,Donella_Manderly
+Sisterton,Vale_of_Arryn,49.35375572,-106.8896484,,
+Coldwater_Burn,Vale_of_Arryn,45.05800144,-95.02441406,,
+House_Baelish,Vale_of_Arryn,43.16512263,-81.13769531,,
+Snakewood,Vale_of_Arryn,41.80407814,-93.09082031,,
+Longbow_Hall,Vale_of_Arryn,39.26628442,-86.93847656,,
+Heart%27s_Home,Vale_of_Arryn,36.7036596,-99.06738281,,
+Strongsong,Vale_of_Arryn,36.84446074,-108.9111328,,
+Old_Anchor,Vale_of_Arryn,33.32134853,-87.72949219,,
+Ironoaks,Vale_of_Arryn,32.21280107,-92.12402344,,
+Runestone,Vale_of_Arryn,32.36140332,-83.07128906,,
+Eyrie,Vale_of_Arryn,31.76553741,-102.4951172,,
+Bloody_Gate,Vale_of_Arryn,29.87875535,-102.9345703,,
+Redfort,Vale_of_Arryn,27.33273514,-95.81542969,,
+Gulltown,Vale_of_Arryn,29.42046034,-84.21386719,,
+Wickenden,Vale_of_Arryn,20.83827781,-96.07910156,,
+Palisade_Village,Vale_of_Arryn,28.03319785,-111.9873047,,A_Storm_of_Swords-Chapter_65
+Castle_Goodbrother,Iron_Islands,31.93351676,-153.4277344,,House_Goodbrother_of_Shatterstone
+Nagga%27s_Hill,Iron_Islands,31.3723991,-154.2626953,,
+Ten_Towers,Iron_Islands,31.3723991,-144.4628906,,
+Hammerhorn,Iron_Islands,30.4676141,-156.1962891,,
+Pebbleton,Iron_Islands,29.55434513,-152.5927734,,
+Pyke,Iron_Islands,27.74188463,-150.6152344,,
+Saltpans,Riverlands,20.92039691,-105.4833984,,
+Quiet_Isle,Riverlands,20.28280869,-105.3295898,,
+Maidenpool,Riverlands,17.64402203,-101.7480469,,
+Twins,Riverlands,38.59970037,-128.7304688,,
+Seagard,Riverlands,35.19176697,-129.2578125,,
+Oldstones,Riverlands,30.92107638,-126.4013672,,
+Fairmarket,Riverlands,29.17134885,-122.578125,,
+Crossroads_Inn,Riverlands,23.42292846,-112.6904297,,
+Riverrun,Riverlands,22.28909642,-128.2910156,,
+Stone_Hedge,Riverlands,22.0856399,-120.9521484,,
+Darry,Riverlands,21.84110475,-112.4707031,,
+Raventree_Hall,Riverlands,19.91138351,-118.6669922,,
+Stone_Mill,Riverlands,18.79191774,-128.7304688,,
+High_Heart,Riverlands,18.45876812,-124.6435547,,
+Acorn_Hall,Riverlands,16.84660511,-125.5224609,,
+Harrenhal,Riverlands,18.25021998,-114.4042969,,
+Rushing_Falls,Riverlands,16.53089842,-116.3378906,,
+Pinkmaiden_Castle,Riverlands,15.4748574,-129.609375,,
+Wayfarer%27s_Rest,Riverlands,16.86763362,-133.4765625,,
+Wendish_Town,Riverlands,13.38961959,-131.2792969,,
+Mummer%27s_Ford,Riverlands,13.94472997,-130.6201172,,
+Sherrer,Riverlands,13.17577122,-130.5322266,,
+Tumbler%27s_Falls,Riverlands,12.49021366,-123.1054688,,
+Hollow_Hill,Riverlands,11.28616077,-128.1152344,,Brotherhood_Without_Banners
+Stoney_Sept,Riverlands,9.817329187,-125.6542969,,
+Robbed_Sept,Riverlands,13.02596593,-126.7089844,,A_Storm_of_Swords-Chapter_39
+Gods_Eye_Holdfast,Riverlands,11.00590446,-114.7998047,,A_Clash_of_Kings-Chapter_14
+Gods_Eye_Village,Riverlands,13.15437606,-111.5478516,,A_Clash_of_Kings-Chapter_19
+Banefort,Westerlands,24.60706914,-147.3632813,,
+Nunn%27s_Deep,Westerlands,22.22809042,-141.9580078,,
+The_Crag,Westerlands,19.80805413,-147.4072266,,
+Pendric_Hills,Westerlands,19.60119416,-144.375,,
+Ashemark,Westerlands,16.84660511,-144.5068359,,
+Castamere,Westerlands,15.66535418,-147.3193359,,
+Faircastle,Westerlands,14.3069695,-152.7246094,,
+Golden_Tooth,Westerlands,14.17918614,-138.6621094,,
+Sarsfield,Westerlands,10.96276426,-145.1660156,,
+Oxcross,Westerlands,9.145486056,-148.5058594,,
+Hornvale,Westerlands,9.058702156,-137.0361328,,
+Kayce,Westerlands,7.49319647,-156.7675781,,
+Feastfires,Westerlands,5.397273408,-157.7783203,,
+Casterly_Rock,Westerlands,6.315298538,-151.3623047,,
+Deep_Den,Westerlands,5.572249801,-136.2451172,,
+Tarbeck_Hall,Westerlands,1.669685501,-152.6367188,,
+Clegane%27s_Keep,Westerlands,1.801460929,-144.4189453,,
+Silverhill,Westerlands,0.263670944,-138.3544922,,
+Cornfield,Westerlands,-2.767477951,-146.8798828,,
+Crakehall,Westerlands,-4.959615025,-154.5703125,,
+Dragonstone,Crownlands,13.19716452,-85.53222656,,
+Dyre_Den,Crownlands,21.20745873,-87.15820313,,
+Whispers,Crownlands,18.52128333,-84.60937,,
+Rook%27s_Rest,Crownlands,14.09395718,-94.27734375,,
+Antlers,Crownlands,14.22178863,-103.8574219,,
+Ivy_Inn,Crownlands,10.22843727,-108.1201172,,A_Clash_of_Kings-Chapter_5
+Sow%27s_Horn,Crownlands,10.83330598,-106.7138672,,
+Duskendale,Crownlands,8.624472108,-98.80371094,,
+Brindlewood,Crownlands,7.44962426,-107.5488281,,
+Stokeworth,Crownlands,5.747174077,-103.9453125,,
+Rosby,Crownlands,3.995780513,-102.4951172,,
+Hayford,Crownlands,3.469557303,-106.9775391,,
+King%27s_Landing,Crownlands,1.318243057,-105.9960938,,
+Stonedance,Crownlands,5.309766172,-86.015625,,
+Sharp_Point,Crownlands,8.32021229,-87.59765625,,
+Tumbleton,The_Reach,-4.784468967,-114.7998047,,
+Red_Lake,The_Reach,-8.146242825,-145.9130859,,
+Goldengrove,The_Reach,-10.96276426,-138.1787109,,
+Bitterbridge,The_Reach,-11.04903835,-124.0283203,,
+Old_Oak,The_Reach,-14.51978005,-151.4941406,,
+Longtable,The_Reach,-14.68988137,-125.2587891,,
+Grassy_Vale,The_Reach,-13.06877673,-113.4375,,
+Cider_Hall,The_Reach,-18.60460139,-129.7412109,,
+Ashford,The_Reach,-20.59165212,-123.0615234,,
+Highgarden,The_Reach,-23.96617587,-138.3544922,,
+Bandallon,The_Reach,-29.53522956,-154.8339844,,
+Brightwater_Keep,The_Reach,-29.99300228,-149.2529297,,
+Horn_Hill,The_Reach,-29.72622232,-138.0029297,,
+Honeyholt,The_Reach,-32.99023556,-148.2861328,,
+Oldtown,The_Reach,-36.6331621,-149.8681641,,
+Blackcrown,The_Reach,-38.71980474,-155.3613281,,
+Uplands,The_Reach,-37.40507375,-141.4746094,,
+Three_Towers,The_Reach,-41.11246879,-152.8125,,
+Sunflower_Hall,The_Reach,-45.79816953,-144.5068359,,
+Haystack_Hall,Stormlands,-7.885147283,-91.77246094,,
+Parchments,Stormlands,-8.32021229,-85.75195313,,
+Bronzegate,Stormlands,-8.754794702,-94.49707031,,
+Fawnton,Stormlands,-10.31491929,-107.8125,,
+Felwood,Stormlands,-12.12526422,-97.35351563,,
+Evenfall_Hall,Stormlands,-12.76894644,-83.77441406,,
+Storm%27s_End,Stormlands,-16.17247281,-91.86035156,,
+Grandview,Stormlands,-18.14585177,-101.2646484,,
+Griffin%27s_Roost,Stormlands,-18.43792465,-95.28808594,,
+Summerhall,Stormlands,-20.01464545,-108.2519531,,
+Rain_House,Stormlands,-21.12549764,-82.67578125,,
+Crow%27s_Nest,Stormlands,-22.06527807,-98.23242188,,
+Harvest_Hall,Stormlands,-21.90227797,-116.1621094,,
+Blackhaven,Stormlands,-24.20688962,-110.6689453,,
+Stonehelm,Stormlands,-25.52261465,-102.1875,,
+Mistwood,Stormlands,-27.56672143,-90.84960938,,
+Greenstone,Stormlands,-28.49766083,-83.68652344,,
+Weeping_Tower,Stormlands,-30.22110185,-91.20117188,,
+Nightsong,Stormlands,-29.07537518,-127.1923828,,
+Wyl_(Dorne),Dorne,-29.19053283,-110.9765625,,
+Vulture%27s_Roost,Dorne,-30.97760909,-122.3144531,,
+Tower_of_Joy,Dorne,-31.95216224,-124.2919922,,
+Kingsgrave,Dorne,-34.81380332,-124.3359375,,
+Blackmont,Dorne,-36.77409249,-132.8613281,,
+High_Hermitage,Dorne,-38.95940879,-132.7294922,,
+Starfall,Dorne,-41.37680857,-135.6298828,,
+Sandstone,Dorne,-44.93369639,-126.9726563,,
+Skyreach,Dorne,-38.75408328,-125.0830078,,
+Hellholt,Dorne,-44.18220396,-117.0849609,,
+Yronwood,Dorne,-37.64903402,-114.4482422,,
+Ghaston_Grey,Dorne,-35.31736633,-105,,
+Vaith,Dorne,-44.59046718,-100.8251953,,
+Tor,Dorne,-38.75408328,-99.85839844,,
+Salt_Shore,Dorne,-46.80005945,-97.04589844,,
+Godsgrace,Dorne,-42.45588764,-96.69433594,,
+Ghost_Hill,Dorne,-39.26628442,-87.55371094,,
+Lemonwood,Dorne,-45.33670191,-86.93847656,,
+Planky_Town,Dorne,-44.0560117,-86.63085938,,
+Sunspear,Dorne,-43.58039086,-84.56542969,,
+Water_Gardens,Dorne,-42.97250159,-84.08203125,,
+Port_of_Ibben,Essos,75.99483914,8.466796875,,
+Braavos,Essos,43.92954994,-59.78027344,,
+Lorath,Essos,39.77476949,-39.38964844,,
+Tyrosh,Essos,-26.70635986,-69.31640625,,
+Lys,Essos,-43.77109382,-56.96777344,,
+Myr,Essos,-23.28171918,-49.18945313,,
+Pentos,Essos,4.083452772,-59.16503906,,
+Ghoyan_Drohe,Essos,7.754537347,-43.828125,,
+Norvos,Essos,19.72534225,-31.34765625,,
+Qohor,Essos,4.477856486,-5.5078125,,
+Ar_Noy,Essos,-3.864254616,-16.84570313,,
+Ny_Sar,Essos,-1.054627942,-29.72167969,,
+Sorrows,Essos,-20.79720143,-22.82226563,,
+Selhorys,Essos,-32.62087018,-19.96582031,,
+Valysar,Essos,-38.34165619,-20.22949219,,
+Volon_Therys,Essos,-41.60722821,-17.32910156,,
+Sar_Mell,Essos,-41.44272638,-15.52734375,,
+Volantis,Essos,-44.37098696,-10.69335938,,
+Mantarys,Essos,-50.73645514,39.31640625,,
+Bhorash,Essos,-46.86019102,61.24511719,,
+Oros,Essos,-64.79284778,36.72363281,,
+Tyria,Essos,-67.05030412,34.83398438,,
+Valyria,Essos,-70.259452,32.41699219,,
+Velos,Essos,-62.36999628,56.89453125,,
+Ghozai,Essos,-58.83649009,55.48828125,,
+Elyria,Essos,-55.65279803,43.93066406,,
+Tolos,Essos,-54.39335222,49.3359375,,
+Meereen,Essos,-45.49094569,80.44921875,,
+Yunkai,Essos,-49.78126406,75.48339844,,
+Astapor,Essos,-58.69977573,71.79199219,,
+Old_Ghis,Essos,-66.63555578,75.26367188,,
+New_Ghis,Essos,-71.92452774,78.99902344,,
+Vaes_Dothrak,Essos,-18.02052766,71.8359375,,
+Lhazar,Essos,-38.27268854,103.3447266,,
+Vaes_Tolorro,Essos,-76.21644112,139.6435547,,
+Dead_City1,Essos,-76.94048839,134.8095703,,Red_Waste#Geography
+Dead_City2,Essos,-77.85109964,125.0537109,,Red_Waste#Geography
+Qarth,Essos,-81.36788549,161.3964844,,
+Zamettar,Sothoryos,-79.14653825,70.73730469,,
+Gogossos,Sothoryos,-80.78175823,58.21289063,,
+Yeen,Sothoryos,-81.01805777,74.82421875,,
+Tall_Trees_Town,Summer_Isles,-73.50346064,-130.9277344,,
\ No newline at end of file
diff --git a/index.html b/index.html
index 6ad08e1..95aaa87 100644
--- a/index.html
+++ b/index.html
@@ -8,6 +8,7 @@
   <script src='js/angular-google-maps.min.js'></script>
   <script src="js/angular-csv-service.min.js"></script>
   <script src="js/angular-toggle-switch.min.js"></script>
+  <script src="js/q-spread.min.js"></script>
   <script src='js/ui-bootstrap-2.0.0.min.js'></script>
   <script src='js/app.js'></script>
   <script src='js/services.js'></script>
@@ -25,11 +26,11 @@
   <ui-gmap-google-map center='map.center' zoom='map.zoom' options='map.options' events='map.events' control='map.control'>
 
     <!-- Base map tiles from Ser Mountain Goat -->
-    <ui-gmap-map-type options='smgMapType'></ui-gmap-map-type>
+    <ui-gmap-map-type options='map.smgMapType'></ui-gmap-map-type>
 
     <!-- Location Markers -->
     <ui-gmap-markers
-      models='map.locations'
+      models='mapModels.towns'
       coords="'coords'"
       click='map.locationClick'
       options="'options'"
@@ -37,18 +38,18 @@
     </ui-gmap-markers>
 
     <!-- Heraldry Markers -->
-    <!-- <ui-gmap-markers
-      models='map.heraldry'
+    <ui-gmap-markers
+      models='mapModels.heraldry'
       coords="'coords'"
-      click='map.houseClick'
       options="'options'"
       visible="options.houseHeraldry"
+      click="map.heraldryClick"
       idkey="'key'">
-    </ui-gmap-markers> -->
+    </ui-gmap-markers>
 
     <!-- Region Polygons -->
     <ui-gmap-polygons
-      models="map.regions"
+      models="mapModels.regions"
       path="'path'"
       fill="'fill'"
       stroke="'stroke'"
@@ -154,9 +155,9 @@
           {{locationDetail.name}}
           <i class="glyphicon glyphicon-menu-right pull-right"></i>
         </a>
-        <a ng-href="{{locationDetail.currentOccupant.url}}" role="button" class="list-group-item btn-clear" ng-if="locationDetail.currentOccupant">
-          <img ng-src="{{locationDetail.currentOccupant.img}}">
-          {{locationDetail.currentOccupant.name}}
+        <a ng-href="{{locationDetail.houseUrl}}" role="button" class="list-group-item btn-clear" ng-if="locationDetail.houseUrl">
+          <img ng-src="{{locationDetail.houseImg}}">
+          {{locationDetail.house}}
           <i class="glyphicon glyphicon-menu-right pull-right"></i>
         </a>
         <a ng-href="{{locationDetail.direct}}" role="button" class="list-group-item btn-clear">
@@ -200,7 +201,7 @@
       </h1>
       <div class="list-group" ng-show="search!==''">
         <button
-          ng-repeat="result in searchResults | filter:{ search: search }"
+          ng-repeat="result in searchResults | filter:{ title: search }"
           class="list-group-item"
           ng-click="result.click()">
           <i class="glyphicon {{result.icon}}"></i>
diff --git a/js/app.js b/js/app.js
index 79e6ca3..84fb1d2 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1,4 +1,4 @@
-angular.module('quartermaester', ['ui.bootstrap', 'uiGmapgoogle-maps', 'fCsv', 'toggle-switch', 'rzModule'])
+angular.module('quartermaester', ['ui.bootstrap', 'uiGmapgoogle-maps', '$q-spread', 'fCsv', 'toggle-switch', 'rzModule'])
 
 .config(function(uiGmapGoogleMapApiProvider) {
     uiGmapGoogleMapApiProvider.configure({
diff --git a/js/controller.js b/js/controller.js
index 3dbceee..2844ddd 100644
--- a/js/controller.js
+++ b/js/controller.js
@@ -1,13 +1,21 @@
 angular.module('quartermaester')
 
-.controller("mapCtrl", function($scope, $q, $filter, $timeout, uiGmapGoogleMapApi, smgMapType, qmCsv) {
+.controller("mapCtrl", function($scope, $filter, $timeout, uiGmapGoogleMapApi, smgMapType, qmCsv) {
 
+    var qmData = {};
     $scope.state = "slider";
+    $scope.search = "";
     $scope.slider = {
       show: "episodes",
       currentEpisode: 0,
       currentChapter: 0
     };
+    $scope.options = {
+      characterPaths: true,
+      houseHeraldry: false,
+      geographicRegions: false,
+      politicalAllegiances: false
+    };
     $scope.map = {
       center: {
         latitude: 1.3182,
@@ -16,60 +24,67 @@ angular.module('quartermaester')
       zoom: 4,
       options: {
         maxZoom: 5,
-        minZoom: 1
+        minZoom: 1,
+        disableDefaultUI: true,
+        zoomControl: true
       },
       events: {
         click: mapClick
       },
       control: {},
+      smgMapType: smgMapType,
       locationClick: locationClick,
-      locations: []
+      heraldryClick: heraldryClick
     };
-    $scope.options = {
-      characterPaths: true,
-      houseHeraldry: false,
-      geographicRegions: false,
-      politicalAllegiances: false
+    $scope.mapModels = {
+      towns: [],
+      heraldry: [],
+      characters: [],
+      paths: [],
+      regions: [],
+      loyalties: []
     };
-    $scope.search = "";
-    $scope.smgMapType = smgMapType;
+    $scope.episodes = [];
+    $scope.chapters = [];
+    $scope.searchResults = [];
     $scope.toState = toState;
     $scope.slideTo = slideTo;
     $scope.panTo = panTo;
-    $scope.episodes = [];
-    $scope.chapters = [];
-    $scope.searchResults = [
-      {
-        icon: "glyphicon-user",
-        title: "Eddard Stark",
-        subtitle: "House Stark",
-        search: "Eddard Stark",
-        click: function(){showCharacter("eddard")}
-      }
-    ];
+    $scope.refreshMap = refreshMap;
     $scope.locationDetail = null;
 
     // Set up promises
     uiGmapGoogleMapApi.then(onMapLoad);
-    $q.all([
-      qmCsv.get('locations.csv'),
-      qmCsv.get('houses.csv')
-    ]).then(createLocationMarkers);
-    $q.all([
-      qmCsv.get('books.csv'),
-      qmCsv.get('chapters.csv')
-    ]).then(addChaptersToScope);
-    qmCsv.get('episodes.csv').then(addEpisodesToScope);
-    $q.all([
-      qmCsv.get('characters.csv'),
-      qmCsv.get('houses.csv')
-    ]).then(addCharactersToScope);
-    $q.all([
-      qmCsv.get('regions.csv'),
-      qmCsv.get('borders.csv')
-    ]).then(addRegionsToScope);
+    qmCsv.loadData().then(addToScope);
 
 
+//////////////////
+
+    function addToScope(d) {
+      qmData = d;
+
+      // Add data from CSV files into $scope
+      $scope.episodes = qmData.episodes;
+      $scope.chapters = qmData.chapters;
+      $scope.characters = qmData.characters;
+      $scope.searchResults = qmData.searchResults;
+      $scope.mapModels.regions = qmData.regions;
+
+      $scope.$watch('slider',  refreshMap, true);
+      $scope.$watch('options', refreshMap, true);
+
+      return true;
+    }
+
+    function refreshMap() {
+      // Redraw map with new slider values
+      $scope.mapModels.towns = $filter('qmSlider')(qmData.towns, $scope.slider);
+      $scope.mapModels.heraldry = $scope.options.houseHeraldry ? $filter('qmSlider')(qmData.heraldry, $scope.slider) : [];
+      //console.log("heraldry", $scope.mapModels.heraldry);
+
+
+    }
+
     function toState(stateName) {
       $scope.state = stateName;
       if (stateName=="search")
@@ -79,21 +94,22 @@ angular.module('quartermaester')
     }
 
     function slideTo(input) {
-      var books = $scope.books.map(function(book) {return book.abbreviation;});
-      var sliderIndex = ($scope.slider.show=="episodes") ? "currentEpisode" : "currentChapter";
+      console.log("qmData", qmData);
+      var books = qmData.books.map(function(book) {return book.abbreviation;});
+      var measure = ($scope.slider.show=="episodes") ? "currentEpisode" : "currentChapter";
       var sliderMax   = ($scope.slider.show=="episodes") ? $scope.episodes.length-1 : $scope.chapters.length-1;
       switch (input) {
         case -10:
-          $scope.slider[sliderIndex] = 0;
+          $scope.slider[measure] = 0;
           break;
         case -1:
-          if ($scope.slider[sliderIndex]>0) $scope.slider[sliderIndex]--;
+          if ($scope.slider[measure]>0) $scope.slider[measure]--;
           break;
         case 1:
-          if ($scope.slider[sliderIndex]<sliderMax) $scope.slider[sliderIndex]++;
+          if ($scope.slider[measure]<sliderMax) $scope.slider[measure]++;
           break;
         case 10:
-          $scope.slider[sliderIndex] = sliderMax;
+          $scope.slider[measure] = sliderMax;
           break;
         default:
           $scope.state = "slider";
@@ -107,7 +123,7 @@ angular.module('quartermaester')
           $scope.slider.show = "chapters";
           var reMatch = /(\w{4})\-(\d+)/.exec(input);
           var bookId = books.indexOf(reMatch[1]);
-          $scope.slider.currentChapter = parseInt($scope.books[bookId].precedingChapters, 10) + parseInt(reMatch[2], 10);
+          $scope.slider.currentChapter = parseInt(qmData.books[bookId].precedingChapters, 10) + parseInt(reMatch[2], 10);
           break;
       }
 
@@ -122,114 +138,12 @@ angular.module('quartermaester')
       $scope.state = "location";
     }
 
-    function addEpisodesToScope(response) {
-      $scope.episodes = response.map(function(episode) {
-        var epNumber = (episode.episode.length==2) ? episode.episode : "0"+episode.episode;
-        return {
-          name: "S" + episode.season + "E" + epNumber + ": " + episode.title,
-          url: (episode.awoiaf=="") ? "https://en.wikipedia.org/wiki/"+episode.wikipedia : "http://awoiaf.westeros.org/index.php/"+episode.awoiaf
-        };
-      });
-      //console.log("e", $scope.episodes);
-
-      $scope.searchResults = $scope.searchResults.concat(response.map(function(episode) {
-        var epNumber = (episode.episode.length==2) ? episode.episode : "0"+episode.episode;
-        return {
-          icon: "glyphicon-facetime-video",
-          title: episode.title,
-          subtitle: "HBO episode",
-          search: episode.title,
-          abbr: "S" + episode.season + "E" + epNumber + ": " + episode.title,
-          click: function(){slideTo(this.abbr)}
-        };
-      }));
-    }
-
-    function addChaptersToScope(response) {
-      $scope.books = response[0];
-      $scope.chapters = response[1].map(function(chapter) {
-        return {
-          name: response[0][chapter.book].abbreviation + "-" + chapter.chapter + ": " + chapter.title,
-          url: "http://awoiaf.westeros.org/index.php/"+chapter.awoiaf
-        };
-      });
-      //console.log("c", $scope.chapters);
-
-      $scope.searchResults = $scope.searchResults.concat(response[1].map(function(chapter) {
-        return {
-          icon: "glyphicon-book",
-          title: chapter.title,
-          subtitle: response[0][chapter.book].title,
-          search: chapter.title,
-          abbr: response[0][chapter.book].abbreviation + "-" + chapter.chapter,
-          click: function(){slideTo(this.abbr)}
-        };
-      }));
-    }
-
-    function addCharactersToScope(responses) {
-      $scope.characters = responses[0].map(function(character) {
-        var output = {
-          name: character.name,
-          url: "http://awoiaf.westeros.org/index.php/" + character.awoiaf,
-          house: ""
-        }
-        if (character.house!="") {
-          matchingHouse = $filter('filter')(responses[1], {wikiKey: character.house})[0];
-          output.house = {
-            name: decodeURI(matchingHouse.wikiKey).replace(/_/g," "),
-            url: "http://awoiaf.westeros.org/index.php/" + matchingHouse.wikiKey,
-            img: matchingHouse.img
-          }
-        }
-        return output;
-      });
-    }
-
-    function addRegionsToScope(responses) {
-      // console.log("regions", responses[0]);
-      // console.log("borders", responses[1]);
-
-      var borderArrays = {};
-      for (var i=0; i<responses[1].length; i++) {
-        if (!(responses[1][i].name in borderArrays)) borderArrays[responses[1][i].name] = [];
-        borderArrays[responses[1][i].name].push(responses[1][i]);
-      }
-
-      $scope.map.regions = responses[0].map(function(region) {
-        return {
-          key: region.name,
-          fill: {
-            color: region.color,
-            opacity: 0.5
-          },
-          stroke: {
-            weight: 0
-          },
-          path: borderArrays[region.name]
-        };
-      });
-    }
-
-    function createLocationMarkers(responses) {
-      $scope.houses = responses[1];
-      $scope.map.locations = qmCsv.setHomes(responses[0], responses[1]);
-      //console.log("locations", $scope.map.locations);
-
-      $scope.searchResults = $scope.searchResults.concat($scope.map.locations.map(function(location) {
-        return {
-          icon: "glyphicon-map-marker",
-          key: location.key,
-          title: location.name,
-          subtitle: (location.occupants.length) ? location.occupants[0].name : "",
-          search: (location.occupants.length) ? location.name + " " + location.occupants[0].name : location.name,
-          click: function(){panTo(this.key)}
-        };
-      }));
-    }
-
     function locationClick(marker, eventName, model) {
-      model.currentOccupant = qmCsv.getCurrentOccupant(model);
+      $scope.locationDetail = model;
+      $scope.state = "location";
+    }
+
+    function heraldryClick(marker, eventName, model) {
       $scope.locationDetail = model;
       $scope.state = "location";
     }
diff --git a/js/q-spread.min.js b/js/q-spread.min.js
new file mode 100644
index 0000000..3434dcc
--- /dev/null
+++ b/js/q-spread.min.js
@@ -0,0 +1 @@
+!function(e){"use strict";e.module("$q-spread",[]).config(["$provide",function(e){e.decorator("$q",["$delegate",function(e){var r=e.defer;return e.defer=function(){var e=r().promise.constructor.prototype;return Object.defineProperty(e,"spread",{value:function(e,r){function n(r){return e.apply(void 0,r)}return this.then(n,r)},writable:!0,enumerable:!1}),r()},e}])}])}(window.angular);
\ No newline at end of file
diff --git a/js/services.js b/js/services.js
index b784e3d..faa0332 100644
--- a/js/services.js
+++ b/js/services.js
@@ -49,17 +49,277 @@ angular.module('quartermaester')
 
  })
 
- .factory('qmCsv', function($http, $filter, fCsv) {
+ .factory('qmCsv', function($q, $http, $filter, fCsv) {
 
   var csvLocation = "http://www.rslc.us/quartermaester/data/";
   return {
-    get: getFile,
-    setHomes: setHomes,
-    getCurrentOccupant: getCurrentOccupant
+    // get: getFile,
+    loadData: loadData,
+    // setHomes: setHomes,
+    // setHeraldry: setHeraldry,
+    // getCurrentOccupant: getCurrentOccupant
   };
 
   ///////////////////////////////
 
+  function loadData() {
+    return $q.all([
+      getFile('books.csv'),
+      getFile('chapters.csv'),
+      getFile('seasons.csv'),
+      getFile('episodes.csv'),
+      getFile('houses.csv'),
+      getFile('characters.csv'),
+      getFile('regions.csv'),
+      getFile('towns.csv'),
+      getFile('borders.csv'),
+      // getFile('stops.csv'),
+      // getFile('waypoints.csv'),
+      // getFile('paths.csv')
+    ]).spread(parseData);
+  }
+
+  function parseData(books, chapters, seasons, episodes, houses, characters, regions, towns, borders, stops, waypoints, paths) {
+    var qmData = {
+      borderArrays: {}
+    };
+
+
+    for (var i=0; i<borders.length; i++) {
+      if (!(borders[i].name in qmData.borderArrays))
+        qmData.borderArrays[borders[i].name] = [];
+      qmData.borderArrays[borders[i].name].push(borders[i]);
+    }
+
+    qmData.episodes   = episodes.map(episodeModel);
+    qmData.chapters   = chapters.map(chapterModel);
+    qmData.books      = books;
+    qmData.regions    = regions.map(regionModel);
+    qmData.characters = characters.map(characterModel);
+    qmData.towns      = getTownMarkers(towns, houses);
+    qmData.heraldry   = houses.map(heraldryMarkerModel);
+
+
+    qmData.searchResults = [].concat(
+      towns.map(townSearchModel),
+      characters.map(characterSearchModel),
+      houses.map(houseSearchModel),
+      episodes.map(episodeSearchModel),
+      chapters.map(chapterSearchModel)
+    );
+
+
+    return qmData;
+
+
+    function episodeModel(episode) {
+      var epNumber = (episode.episode.length==2) ? episode.episode : "0"+episode.episode;
+      return {
+        name: "S" + episode.season + "E" + epNumber + ": " + episode.title,
+        url: (episode.awoiaf=="") ? "https://en.wikipedia.org/wiki/"+episode.wikipedia : "http://awoiaf.westeros.org/index.php/"+episode.awoiaf
+      };
+    }
+
+    function episodeSearchModel(episode) {
+      var epNumber = (episode.episode.length==2) ? episode.episode : "0"+episode.episode;
+      return {
+        icon: "glyphicon-facetime-video",
+        title: episode.title,
+        subtitle: "HBO episode",
+        abbr: "S" + episode.season + "E" + epNumber + ": " + episode.title,
+        click: function(){slideTo(this.abbr)}
+      };
+    }
+
+    function chapterModel(chapter) {
+      return {
+        name: books[chapter.book].abbreviation + "-" + chapter.chapter + ": " + chapter.title,
+        url: "http://awoiaf.westeros.org/index.php/"+chapter.awoiaf
+      };
+    }
+
+    function chapterSearchModel(chapter) {
+      return {
+        icon: "glyphicon-book",
+        title: chapter.title,
+        subtitle: books[chapter.book].title,
+        abbr: books[chapter.book].abbreviation + "-" + chapter.chapter,
+        click: function(){slideTo(this.abbr)}
+      };
+    }
+
+    function getTownMarkers(towns, houses) {
+      var output = [];
+      var matchingHouses = [];
+      for (var townId=0; townId<towns.length; townId++) {
+        var town = towns[townId];
+        var matchingHouses = $filter('filter')(houses, {seatKey: town.key});
+
+        // Towns without nobility or other locations
+        if (matchingHouses.length==0) output.push({
+          key: town.key,
+          name: decodeURI(town.key).replace(/_/g," "),
+          url: "http://awoiaf.westeros.org/index.php/" + town.key,
+          house: "No known lord",
+          houseUrl: null,
+          timing: {
+            episodes: [0,999],
+            chapters: [0,999]
+          },
+          direct: "#@" + town.key,
+          coords: {
+            latitude:  parseFloat(town.latitude),
+            longitude: parseFloat(town.longitude)
+          },
+          options: {
+            icon: {path: 0, strokeOpacity: 0, scale: 3}
+          }
+        });
+
+        for (var houseId=0; houseId<matchingHouses.length; houseId++) {
+          var house = matchingHouses[houseId];
+          output.push({
+            key: town.key,
+            name: decodeURI(town.key).replace(/_/g," "),
+            url: "http://awoiaf.westeros.org/index.php/" + town.key,
+            house: decodeURI(house.wikiKey).replace(/_/g," "),
+            houseUrl: "http://awoiaf.westeros.org/index.php/" + house.wikiKey,
+            houseImg: house.img,
+            timing: {
+              episodes: [
+                parseInt(house.firstEpisode, 10) || 0,
+                parseInt(house.lastEpisode , 10) || 999
+              ],
+              chapters: [
+                parseInt(house.firstChapter, 10) || 0,
+                parseInt(house.lastChapter , 10) || 999
+              ]
+            },
+            direct: "#@" + town.key,
+            coords: {
+              latitude:  parseFloat(town.latitude),
+              longitude: parseFloat(town.longitude)
+            },
+            options: {
+              icon: {path: 0, strokeOpacity: 0, scale: 3}
+            }
+          });
+        }
+
+      }
+
+
+      return output;
+    }
+
+    function townSearchModel(town) {
+      return {
+        icon: "glyphicon-map-marker",
+        key: town.key,
+        title: town.name,
+        subtitle: town.region.replace(/_/g," "),
+        click: function(){panTo(this.key)}
+      };
+    }
+
+    function characterModel(character) {
+      var output = {
+        name: character.name,
+        url: "http://awoiaf.westeros.org/index.php/" + character.awoiaf,
+        house: ""
+      }
+      if (character.house!="") {
+        matchingHouse = $filter('filter')(houses, {wikiKey: character.house})[0];
+        output.house = {
+          name: decodeURI(matchingHouse.wikiKey).replace(/_/g," "),
+          url: "http://awoiaf.westeros.org/index.php/" + matchingHouse.wikiKey,
+          img: matchingHouse.img
+        }
+      }
+      return output;
+    }
+
+    function characterSearchModel(character) {
+      return {
+        icon: "glyphicon-user",
+        key: character.key,
+        title: character.name,
+        subtitle: decodeURI(character.house).replace(/_/g," "),
+        click: function(){showCharacter(this.key)}
+      };
+    }
+
+    function heraldryMarkerModel(house, index) {
+      if (house.seatKey=="") {
+        var coords = {
+          latitude:  parseFloat(house.lat),
+          longitude: parseFloat(house.lng)
+        };
+      } else {
+        var matchingTown = $filter('filter')(qmData.towns, {key: house.seatKey})[0];
+        var coords = matchingTown.coords;
+      }
+      house.isGreat = (house.isGreat=="TRUE");
+
+      return {
+        key: "house-" + index,
+        name: decodeURI(house.wikiKey).replace(/_/g," "),
+        url: "http://awoiaf.westeros.org/index.php/" + house.wikiKey,
+        seat: decodeURI(house.seatKey).replace(/_/g," ") || house.clue || "unknown",
+        seatUrl: "http://awoiaf.westeros.org/index.php/" + house.seatKey,
+        houseImg: house.img,
+        timing: {
+          episodes: [
+            parseInt(house.firstEpisode, 10) || 0,
+            parseInt(house.lastEpisode , 10) || 999
+          ],
+          chapters: [
+            parseInt(house.firstChapter, 10) || 0,
+            parseInt(house.lastChapter , 10) || 999
+          ]
+        },
+        direct: "#@" + house.seatKey,
+        coords: coords,
+        options: {
+          icon: {
+            url: house.img,
+            scaledSize: house.isGreat ? {height:60, width:50} : {height:30, width:25},
+            anchor: house.isGreat ? {x:30, y:25} : {x:15, y:12}
+          }
+        }
+      };
+    }
+
+    function houseSearchModel(house) {
+      return {
+        icon: "glyphicon-home",
+        title: decodeURI(house.wikiKey).replace(/_/g," "),
+        subtitle: (house.seatKey=="") ? house.clue : decodeURI(house.seatKey).replace(/_/g," "),
+        click: function(){showCharacter(character.key)}
+      };
+    }
+
+    function regionModel(region) {
+      return {
+        key: region.key,
+        fill: {
+          color: region.color,
+          opacity: 0.5
+        },
+        stroke: {weight: 0},
+        path: qmData.borderArrays[region.key]
+      };
+    }
+
+  }
+
+
+
+
+
+
+
+
   function getFile(filename) {
     return $http
       .get(csvLocation + filename)
@@ -72,52 +332,6 @@ angular.module('quartermaester')
     return resp.data;
   }
 
-  function setHomes(locations, houses) {
-    //console.log(locations, houses);
-
-    var markers = locations.map(locationModel);
-
-    for (var i=0; i<markers.length; i++) {
-      var matchingHouses = $filter('filter')(houses, {seatKey: locations[i].key});
-      markers[i].occupants = matchingHouses.map(function(house) {
-        return {
-          name: decodeURI(house.wikiKey).replace(/_/g," "),
-          url: "http://awoiaf.westeros.org/index.php/" + house.wikiKey,
-          img: house.img,
-          firstChapter: parseInt(house.firstChapter, 10) || null,
-          lastChapter:  parseInt(house.lastChapter,  10) || null,
-          firstEpisode: parseInt(house.firstEpisode, 10) || null,
-          lastEpisode:  parseInt(house.lastEpisode,  10) || null
-        }
-      });
-
-    }
-
-    return markers;
-  }
-
-  function locationModel(json) {
-    return {
-      key: json.key,
-      name: decodeURI(json.key).replace(/_/g," "),
-      url: "http://awoiaf.westeros.org/index.php/" + json.key,
-      direct: "#@" + json.key,
-      coords: {
-        latitude:  parseFloat(json.latitude),
-        longitude: parseFloat(json.longitude)
-      },
-      options: {
-        icon: {path: 0, strokeOpacity: 0, scale: 3}
-      },
-      occupants: []
-    };
-  }
-
-  function getCurrentOccupant(marker) {
-    if (marker.occupants.length==0) return null;
-    if (marker.occupants.length==1) return marker.occupants[0];
-    return $filter('qmSlider')(marker.occupants, "episodes", 0)[0];
-  }
 
 })
 
@@ -125,18 +339,15 @@ angular.module('quartermaester')
 
   // In the return function, we must pass in a single parameter which will be the data we will work on.
   // We have the ability to support multiple other parameters that can be passed into the filter optionally
-  return function(inputArray, slider, value) {
+  return function(inputArray, slider) {
+
+    var outputArray = [];
+    var currentValue = (slider.show=="episodes") ? slider.currentEpisode : slider.currentChapter;
 
-    outputArray = [];
     for (var i=0; i<inputArray.length; i++) {
-      switch (slider) {
-        case "episodes":
-          if (inputArray[i].firstEpisode==null || (value>=inputArray[i].firstEpisode && value<=inputArray[i].lastEpisode)) outputArray.push(inputArray[i]);
-          break;
-        case "chapters":
-          if (inputArray[i].firstChapter==null || (value>=inputArray[i].firstChapter && value<=inputArray[i].lastChapter)) outputArray.push(inputArray[i]);
-          break;
-      }
+      if (currentValue < inputArray[i].timing[slider.show][0]) continue;
+      if (currentValue > inputArray[i].timing[slider.show][1]) continue;
+      outputArray.push(inputArray[i]);
     }
 
     return outputArray;