diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index a16f310..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "geocsv",
-  "version": "0.1.0-SNAPSHOT",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "leaflet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.1.tgz",
-      "integrity": "sha512-adQOIzh+bfdridLM1xIgJ9VnJbAUY3wqs/ueF+ITla+PLQ1z47USdBKUf+iD9FuUA8RtlT6j6hZBfZoA6mW+XQ=="
-    }
-  }
-}
diff --git a/project.clj b/project.clj
index bc0b0f7..fa8b919 100644
--- a/project.clj
+++ b/project.clj
@@ -13,7 +13,7 @@
                  [com.cognitect/transit-clj "0.8.319"]
                  [compojure "1.6.1"]
                  [cprop "0.1.15"]
-                 [csv2edn "0.1.5"]
+                 [csv2edn "0.1.6"]
                  [day8.re-frame/http-fx "0.1.6"]
                  [expound "0.8.3"]
                  [funcool/struct "1.4.0"]
@@ -43,7 +43,10 @@
                  [selmer "1.12.18"]]
 
   :min-lein-version "2.0.0"
-  :npm {:dependencies [[leaflet "1.3.1"]]}
+  :npm {:dependencies [[bulma "0.8.0"]
+                       [leaflet "1.3.1"]
+                       [material-design-icons "3.0.1"]]
+        :root "resources/public/js/lib/node_modules"}
 
   :source-paths ["src/clj" "src/cljs" "src/cljc"]
   :test-paths ["test/clj"]
diff --git a/resources/html/error.html b/resources/html/error.html
index fd31cc5..88103f7 100644
--- a/resources/html/error.html
+++ b/resources/html/error.html
@@ -4,7 +4,7 @@
     <title>Something Bad Happened</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    {% style "/assets/bulma/css/bulma.min.css" %}
+    {% style "/js/lib/node_modules/bulma/css/bulma.min.css" %}
     <style type="text/css">
         html {
             height: 100%;
diff --git a/resources/html/home.html b/resources/html/home.html
index 9cb562e..5f65079 100644
--- a/resources/html/home.html
+++ b/resources/html/home.html
@@ -44,8 +44,8 @@
     {% endblock %}
 
     <!-- scripts and styles -->
-    {% style "/assets/bulma/css/bulma.min.css" %}
-    {% style "/assets/material-icons/css/material-icons.min.css" %}
+    {% style "/js/lib/node_modules/bulma/css/bulma.min.css" %}
+    {% style "/js/lib/node_modules/material-icons/iconfont/material-icons.css" %}
     {% style "/css/screen.css" %}
     {% style "/css/geocsv.css" %}
 
diff --git a/resources/public/css/screen.css b/resources/public/css/screen.css
index e90ddb8..16aa762 100644
--- a/resources/public/css/screen.css
+++ b/resources/public/css/screen.css
@@ -6,12 +6,12 @@ body {
   font-family: 'Material Icons';
   font-style: normal;
   font-weight: 400;
-  src: url(/assets/material-icons/iconfont/MaterialIcons-Regular.eot); /* For IE6-8 */
+  src: url(/js/lib/node_modules/material-icons/iconfont/MaterialIcons-Regular.eot); /* For IE6-8 */
   src: local('Material Icons'),
        local('MaterialIcons-Regular'),
-       url(/assets/material-icons/iconfont/MaterialIcons-Regular.woff2) format('woff2'),
-       url(/assets/material-icons/iconfont/MaterialIcons-Regular.woff) format('woff'),
-       url(/assets/material-icons/iconfont/MaterialIcons-Regular.ttf) format('truetype');
+       url(/js/lib/node_modules/material-icons/iconfont/MaterialIcons-Regular.woff2) format('woff2'),
+       url(/js/lib/node_modules/material-icons/iconfont/MaterialIcons-Regular.woff) format('woff'),
+       url(/js/lib/node_modules/material-icons/iconfont/MaterialIcons-Regular.ttf) format('truetype');
 }
 .material-icons {
   font-family: 'Material Icons';
diff --git a/resources/public/js/lib/node_modules/leaflet/dist/leaflet.css b/resources/public/js/lib/node_modules/leaflet/dist/leaflet.css
deleted file mode 100644
index d1b47a1..0000000
--- a/resources/public/js/lib/node_modules/leaflet/dist/leaflet.css
+++ /dev/null
@@ -1,636 +0,0 @@
-/* required styles */
-
-.leaflet-pane,
-.leaflet-tile,
-.leaflet-marker-icon,
-.leaflet-marker-shadow,
-.leaflet-tile-container,
-.leaflet-pane > svg,
-.leaflet-pane > canvas,
-.leaflet-zoom-box,
-.leaflet-image-layer,
-.leaflet-layer {
-	position: absolute;
-	left: 0;
-	top: 0;
-	}
-.leaflet-container {
-	overflow: hidden;
-	}
-.leaflet-tile,
-.leaflet-marker-icon,
-.leaflet-marker-shadow {
-	-webkit-user-select: none;
-	   -moz-user-select: none;
-	        user-select: none;
-	  -webkit-user-drag: none;
-	}
-/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
-.leaflet-safari .leaflet-tile {
-	image-rendering: -webkit-optimize-contrast;
-	}
-/* hack that prevents hw layers "stretching" when loading new tiles */
-.leaflet-safari .leaflet-tile-container {
-	width: 1600px;
-	height: 1600px;
-	-webkit-transform-origin: 0 0;
-	}
-.leaflet-marker-icon,
-.leaflet-marker-shadow {
-	display: block;
-	}
-/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
-/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
-.leaflet-container .leaflet-overlay-pane svg,
-.leaflet-container .leaflet-marker-pane img,
-.leaflet-container .leaflet-shadow-pane img,
-.leaflet-container .leaflet-tile-pane img,
-.leaflet-container img.leaflet-image-layer {
-	max-width: none !important;
-	max-height: none !important;
-	}
-
-.leaflet-container.leaflet-touch-zoom {
-	-ms-touch-action: pan-x pan-y;
-	touch-action: pan-x pan-y;
-	}
-.leaflet-container.leaflet-touch-drag {
-	-ms-touch-action: pinch-zoom;
-	/* Fallback for FF which doesn't support pinch-zoom */
-	touch-action: none;
-	touch-action: pinch-zoom;
-}
-.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.leaflet-container {
-	-webkit-tap-highlight-color: transparent;
-}
-.leaflet-container a {
-	-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
-}
-.leaflet-tile {
-	filter: inherit;
-	visibility: hidden;
-	}
-.leaflet-tile-loaded {
-	visibility: inherit;
-	}
-.leaflet-zoom-box {
-	width: 0;
-	height: 0;
-	-moz-box-sizing: border-box;
-	     box-sizing: border-box;
-	z-index: 800;
-	}
-/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
-.leaflet-overlay-pane svg {
-	-moz-user-select: none;
-	}
-
-.leaflet-pane         { z-index: 400; }
-
-.leaflet-tile-pane    { z-index: 200; }
-.leaflet-overlay-pane { z-index: 400; }
-.leaflet-shadow-pane  { z-index: 500; }
-.leaflet-marker-pane  { z-index: 600; }
-.leaflet-tooltip-pane   { z-index: 650; }
-.leaflet-popup-pane   { z-index: 700; }
-
-.leaflet-map-pane canvas { z-index: 100; }
-.leaflet-map-pane svg    { z-index: 200; }
-
-.leaflet-vml-shape {
-	width: 1px;
-	height: 1px;
-	}
-.lvml {
-	behavior: url(#default#VML);
-	display: inline-block;
-	position: absolute;
-	}
-
-
-/* control positioning */
-
-.leaflet-control {
-	position: relative;
-	z-index: 800;
-	pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
-	pointer-events: auto;
-	}
-.leaflet-top,
-.leaflet-bottom {
-	position: absolute;
-	z-index: 1000;
-	pointer-events: none;
-	}
-.leaflet-top {
-	top: 0;
-	}
-.leaflet-right {
-	right: 0;
-	}
-.leaflet-bottom {
-	bottom: 0;
-	}
-.leaflet-left {
-	left: 0;
-	}
-.leaflet-control {
-	float: left;
-	clear: both;
-	}
-.leaflet-right .leaflet-control {
-	float: right;
-	}
-.leaflet-top .leaflet-control {
-	margin-top: 10px;
-	}
-.leaflet-bottom .leaflet-control {
-	margin-bottom: 10px;
-	}
-.leaflet-left .leaflet-control {
-	margin-left: 10px;
-	}
-.leaflet-right .leaflet-control {
-	margin-right: 10px;
-	}
-
-
-/* zoom and fade animations */
-
-.leaflet-fade-anim .leaflet-tile {
-	will-change: opacity;
-	}
-.leaflet-fade-anim .leaflet-popup {
-	opacity: 0;
-	-webkit-transition: opacity 0.2s linear;
-	   -moz-transition: opacity 0.2s linear;
-	     -o-transition: opacity 0.2s linear;
-	        transition: opacity 0.2s linear;
-	}
-.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
-	opacity: 1;
-	}
-.leaflet-zoom-animated {
-	-webkit-transform-origin: 0 0;
-	    -ms-transform-origin: 0 0;
-	        transform-origin: 0 0;
-	}
-.leaflet-zoom-anim .leaflet-zoom-animated {
-	will-change: transform;
-	}
-.leaflet-zoom-anim .leaflet-zoom-animated {
-	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
-	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
-	     -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
-	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
-	}
-.leaflet-zoom-anim .leaflet-tile,
-.leaflet-pan-anim .leaflet-tile {
-	-webkit-transition: none;
-	   -moz-transition: none;
-	     -o-transition: none;
-	        transition: none;
-	}
-
-.leaflet-zoom-anim .leaflet-zoom-hide {
-	visibility: hidden;
-	}
-
-
-/* cursors */
-
-.leaflet-interactive {
-	cursor: pointer;
-	}
-.leaflet-grab {
-	cursor: -webkit-grab;
-	cursor:    -moz-grab;
-	}
-.leaflet-crosshair,
-.leaflet-crosshair .leaflet-interactive {
-	cursor: crosshair;
-	}
-.leaflet-popup-pane,
-.leaflet-control {
-	cursor: auto;
-	}
-.leaflet-dragging .leaflet-grab,
-.leaflet-dragging .leaflet-grab .leaflet-interactive,
-.leaflet-dragging .leaflet-marker-draggable {
-	cursor: move;
-	cursor: -webkit-grabbing;
-	cursor:    -moz-grabbing;
-	}
-
-/* marker & overlays interactivity */
-.leaflet-marker-icon,
-.leaflet-marker-shadow,
-.leaflet-image-layer,
-.leaflet-pane > svg path,
-.leaflet-tile-container {
-	pointer-events: none;
-	}
-
-.leaflet-marker-icon.leaflet-interactive,
-.leaflet-image-layer.leaflet-interactive,
-.leaflet-pane > svg path.leaflet-interactive {
-	pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
-	pointer-events: auto;
-	}
-
-/* visual tweaks */
-
-.leaflet-container {
-	background: #ddd;
-	outline: 0;
-	}
-.leaflet-container a {
-	color: #0078A8;
-	}
-.leaflet-container a.leaflet-active {
-	outline: 2px solid orange;
-	}
-.leaflet-zoom-box {
-	border: 2px dotted #38f;
-	background: rgba(255,255,255,0.5);
-	}
-
-
-/* general typography */
-.leaflet-container {
-	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-	}
-
-
-/* general toolbar styles */
-
-.leaflet-bar {
-	box-shadow: 0 1px 5px rgba(0,0,0,0.65);
-	border-radius: 4px;
-	}
-.leaflet-bar a,
-.leaflet-bar a:hover {
-	background-color: #fff;
-	border-bottom: 1px solid #ccc;
-	width: 26px;
-	height: 26px;
-	line-height: 26px;
-	display: block;
-	text-align: center;
-	text-decoration: none;
-	color: black;
-	}
-.leaflet-bar a,
-.leaflet-control-layers-toggle {
-	background-position: 50% 50%;
-	background-repeat: no-repeat;
-	display: block;
-	}
-.leaflet-bar a:hover {
-	background-color: #f4f4f4;
-	}
-.leaflet-bar a:first-child {
-	border-top-left-radius: 4px;
-	border-top-right-radius: 4px;
-	}
-.leaflet-bar a:last-child {
-	border-bottom-left-radius: 4px;
-	border-bottom-right-radius: 4px;
-	border-bottom: none;
-	}
-.leaflet-bar a.leaflet-disabled {
-	cursor: default;
-	background-color: #f4f4f4;
-	color: #bbb;
-	}
-
-.leaflet-touch .leaflet-bar a {
-	width: 30px;
-	height: 30px;
-	line-height: 30px;
-	}
-.leaflet-touch .leaflet-bar a:first-child {
-	border-top-left-radius: 2px;
-	border-top-right-radius: 2px;
-	}
-.leaflet-touch .leaflet-bar a:last-child {
-	border-bottom-left-radius: 2px;
-	border-bottom-right-radius: 2px;
-	}
-
-/* zoom control */
-
-.leaflet-control-zoom-in,
-.leaflet-control-zoom-out {
-	font: bold 18px 'Lucida Console', Monaco, monospace;
-	text-indent: 1px;
-	}
-
-.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out  {
-	font-size: 22px;
-	}
-
-
-/* layers control */
-
-.leaflet-control-layers {
-	box-shadow: 0 1px 5px rgba(0,0,0,0.4);
-	background: #fff;
-	border-radius: 5px;
-	}
-.leaflet-control-layers-toggle {
-	background-image: url(images/layers.png);
-	width: 36px;
-	height: 36px;
-	}
-.leaflet-retina .leaflet-control-layers-toggle {
-	background-image: url(images/layers-2x.png);
-	background-size: 26px 26px;
-	}
-.leaflet-touch .leaflet-control-layers-toggle {
-	width: 44px;
-	height: 44px;
-	}
-.leaflet-control-layers .leaflet-control-layers-list,
-.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
-	display: none;
-	}
-.leaflet-control-layers-expanded .leaflet-control-layers-list {
-	display: block;
-	position: relative;
-	}
-.leaflet-control-layers-expanded {
-	padding: 6px 10px 6px 6px;
-	color: #333;
-	background: #fff;
-	}
-.leaflet-control-layers-scrollbar {
-	overflow-y: scroll;
-	overflow-x: hidden;
-	padding-right: 5px;
-	}
-.leaflet-control-layers-selector {
-	margin-top: 2px;
-	position: relative;
-	top: 1px;
-	}
-.leaflet-control-layers label {
-	display: block;
-	}
-.leaflet-control-layers-separator {
-	height: 0;
-	border-top: 1px solid #ddd;
-	margin: 5px -10px 5px -6px;
-	}
-
-/* Default icon URLs */
-.leaflet-default-icon-path {
-	background-image: url(images/marker-icon.png);
-	}
-
-
-/* attribution and scale controls */
-
-.leaflet-container .leaflet-control-attribution {
-	background: #fff;
-	background: rgba(255, 255, 255, 0.7);
-	margin: 0;
-	}
-.leaflet-control-attribution,
-.leaflet-control-scale-line {
-	padding: 0 5px;
-	color: #333;
-	}
-.leaflet-control-attribution a {
-	text-decoration: none;
-	}
-.leaflet-control-attribution a:hover {
-	text-decoration: underline;
-	}
-.leaflet-container .leaflet-control-attribution,
-.leaflet-container .leaflet-control-scale {
-	font-size: 11px;
-	}
-.leaflet-left .leaflet-control-scale {
-	margin-left: 5px;
-	}
-.leaflet-bottom .leaflet-control-scale {
-	margin-bottom: 5px;
-	}
-.leaflet-control-scale-line {
-	border: 2px solid #777;
-	border-top: none;
-	line-height: 1.1;
-	padding: 2px 5px 1px;
-	font-size: 11px;
-	white-space: nowrap;
-	overflow: hidden;
-	-moz-box-sizing: border-box;
-	     box-sizing: border-box;
-
-	background: #fff;
-	background: rgba(255, 255, 255, 0.5);
-	}
-.leaflet-control-scale-line:not(:first-child) {
-	border-top: 2px solid #777;
-	border-bottom: none;
-	margin-top: -2px;
-	}
-.leaflet-control-scale-line:not(:first-child):not(:last-child) {
-	border-bottom: 2px solid #777;
-	}
-
-.leaflet-touch .leaflet-control-attribution,
-.leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-bar {
-	box-shadow: none;
-	}
-.leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-bar {
-	border: 2px solid rgba(0,0,0,0.2);
-	background-clip: padding-box;
-	}
-
-
-/* popup */
-
-.leaflet-popup {
-	position: absolute;
-	text-align: center;
-	margin-bottom: 20px;
-	}
-.leaflet-popup-content-wrapper {
-	padding: 1px;
-	text-align: left;
-	border-radius: 12px;
-	}
-.leaflet-popup-content {
-	margin: 13px 19px;
-	line-height: 1.4;
-	}
-.leaflet-popup-content p {
-	margin: 18px 0;
-	}
-.leaflet-popup-tip-container {
-	width: 40px;
-	height: 20px;
-	position: absolute;
-	left: 50%;
-	margin-left: -20px;
-	overflow: hidden;
-	pointer-events: none;
-	}
-.leaflet-popup-tip {
-	width: 17px;
-	height: 17px;
-	padding: 1px;
-
-	margin: -10px auto 0;
-
-	-webkit-transform: rotate(45deg);
-	   -moz-transform: rotate(45deg);
-	    -ms-transform: rotate(45deg);
-	     -o-transform: rotate(45deg);
-	        transform: rotate(45deg);
-	}
-.leaflet-popup-content-wrapper,
-.leaflet-popup-tip {
-	background: white;
-	color: #333;
-	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
-	}
-.leaflet-container a.leaflet-popup-close-button {
-	position: absolute;
-	top: 0;
-	right: 0;
-	padding: 4px 4px 0 0;
-	border: none;
-	text-align: center;
-	width: 18px;
-	height: 14px;
-	font: 16px/14px Tahoma, Verdana, sans-serif;
-	color: #c3c3c3;
-	text-decoration: none;
-	font-weight: bold;
-	background: transparent;
-	}
-.leaflet-container a.leaflet-popup-close-button:hover {
-	color: #999;
-	}
-.leaflet-popup-scrolled {
-	overflow: auto;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #ddd;
-	}
-
-.leaflet-oldie .leaflet-popup-content-wrapper {
-	zoom: 1;
-	}
-.leaflet-oldie .leaflet-popup-tip {
-	width: 24px;
-	margin: 0 auto;
-
-	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
-	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
-	}
-.leaflet-oldie .leaflet-popup-tip-container {
-	margin-top: -1px;
-	}
-
-.leaflet-oldie .leaflet-control-zoom,
-.leaflet-oldie .leaflet-control-layers,
-.leaflet-oldie .leaflet-popup-content-wrapper,
-.leaflet-oldie .leaflet-popup-tip {
-	border: 1px solid #999;
-	}
-
-
-/* div icon */
-
-.leaflet-div-icon {
-	background: #fff;
-	border: 1px solid #666;
-	}
-
-
-/* Tooltip */
-/* Base styles for the element that has a tooltip */
-.leaflet-tooltip {
-	position: absolute;
-	padding: 6px;
-	background-color: #fff;
-	border: 1px solid #fff;
-	border-radius: 3px;
-	color: #222;
-	white-space: nowrap;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-	pointer-events: none;
-	box-shadow: 0 1px 3px rgba(0,0,0,0.4);
-	}
-.leaflet-tooltip.leaflet-clickable {
-	cursor: pointer;
-	pointer-events: auto;
-	}
-.leaflet-tooltip-top:before,
-.leaflet-tooltip-bottom:before,
-.leaflet-tooltip-left:before,
-.leaflet-tooltip-right:before {
-	position: absolute;
-	pointer-events: none;
-	border: 6px solid transparent;
-	background: transparent;
-	content: "";
-	}
-
-/* Directions */
-
-.leaflet-tooltip-bottom {
-	margin-top: 6px;
-}
-.leaflet-tooltip-top {
-	margin-top: -6px;
-}
-.leaflet-tooltip-bottom:before,
-.leaflet-tooltip-top:before {
-	left: 50%;
-	margin-left: -6px;
-	}
-.leaflet-tooltip-top:before {
-	bottom: 0;
-	margin-bottom: -12px;
-	border-top-color: #fff;
-	}
-.leaflet-tooltip-bottom:before {
-	top: 0;
-	margin-top: -12px;
-	margin-left: -6px;
-	border-bottom-color: #fff;
-	}
-.leaflet-tooltip-left {
-	margin-left: -6px;
-}
-.leaflet-tooltip-right {
-	margin-left: 6px;
-}
-.leaflet-tooltip-left:before,
-.leaflet-tooltip-right:before {
-	top: 50%;
-	margin-top: -6px;
-	}
-.leaflet-tooltip-left:before {
-	right: 0;
-	margin-right: -12px;
-	border-left-color: #fff;
-	}
-.leaflet-tooltip-right:before {
-	left: 0;
-	margin-left: -12px;
-	border-right-color: #fff;
-	}
diff --git a/resources/public/js/package-lock.json b/resources/public/js/package-lock.json
new file mode 100644
index 0000000..48e341a
--- /dev/null
+++ b/resources/public/js/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}
diff --git a/src/clj/geocsv/handler.clj b/src/clj/geocsv/handler.clj
index 001fbf6..b1929ec 100644
--- a/src/clj/geocsv/handler.clj
+++ b/src/clj/geocsv/handler.clj
@@ -26,7 +26,9 @@
     (-> #'rest-routes
         (wrap-routes middleware/wrap-csrf)
         (wrap-routes middleware/wrap-formats))
-    (route/resources "/")
+    (ring/create-resource-handler
+         {:path "/"})
+;;    (route/resources "/")
     (route/not-found
       (:body
         (error-page {:status 404
diff --git a/src/clj/geocsv/routes/resources.clj b/src/clj/geocsv/routes/resources.clj
new file mode 100644
index 0000000..3511ae7
--- /dev/null
+++ b/src/clj/geocsv/routes/resources.clj
@@ -0,0 +1,14 @@
+(ns geocsv.routes.resources
+  "Serve resources for geocsv."
+  (:require [adl-support.core :as ac]
+            [adl-support.rest-support :as ar]
+            [clojure.core.memoize :as memo]
+            [clojure.java.io :as io]
+            [clojure.string :as s]
+            [clojure.tools.logging :as log]
+            [compojure.core :refer [defroutes GET POST]]
+            [csv2edn.csv2edn :refer :all]
+            [noir.response :as nresponse]
+            [noir.util.route :as route]
+            [ring.util.http-response :as response]
+            ))
diff --git a/src/cljs/geocsv/core.cljs b/src/cljs/geocsv/core.cljs
index 26bed9c..a85d2f3 100644
--- a/src/cljs/geocsv/core.cljs
+++ b/src/cljs/geocsv/core.cljs
@@ -90,6 +90,7 @@
 
 (defn init! []
   (rf/dispatch-sync [:initialise-db])
+  (rf/dispatch [:fetch-pin-image-names])
   (start-router!)
   (ajax/load-interceptors!)
   (mount-components))
diff --git a/src/cljs/geocsv/events.cljs b/src/cljs/geocsv/events.cljs
index f461a71..9b0e1aa 100644
--- a/src/cljs/geocsv/events.cljs
+++ b/src/cljs/geocsv/events.cljs
@@ -73,6 +73,24 @@
                        :on-failure      [:bad-data]}
           :db  db})))
 
+(rf/reg-event-fx
+ :fetch-pin-image-names
+ (fn [{db :db} _]
+   (let [uri (assoc source-host
+                  :path "/get-pin-image-names")]
+         (js/console.log
+          (str
+           "Fetching data: " uri))
+         ;; we return a map of (side) effects
+         {:http-xhrio {:method          :get
+                       :uri             uri
+                       :format          (json-request-format)
+                       :response-format (json-response-format {:keywords? true})
+                       :on-success      [:process-pin-image-names]
+                       ;; ignore :on-failure for now
+                       }
+          :db  db})))
+
 (rf/reg-event-fx
   :fetch-docs
   (fn [_ _]
@@ -127,6 +145,17 @@
            (refresh-map-pins (assoc db :data data))
            db)})))
 
+(rf/reg-event-fx
+  :process-pin-image-names
+  (fn
+    [{db :db} [_ response]]
+    (let [db' (assoc db :available-pin-images (set response))]
+    (js/console.log (str "processing pin images"))
+    {:db (if
+           (:view db')
+           (refresh-map-pins db')
+           db')})))
+
 (rf/reg-event-db
   :set-docs
   (fn [db [_ docs]]
diff --git a/src/cljs/geocsv/gis.cljs b/src/cljs/geocsv/gis.cljs
index 4e23769..3aefc87 100644
--- a/src/cljs/geocsv/gis.cljs
+++ b/src/cljs/geocsv/gis.cljs
@@ -71,48 +71,56 @@
 
 (defn pin-image
   "Return the name of a suitable pin image for this `record`."
-  [record]
-  (let [available @(subscribe [:available-pin-images])]
-    (js/console.log (str "pin-image: available is of type `" (type available) "`; `(fn? available)` returns " (set? available)))
+  [db record]
+  (let [available (:available-pin-images db)
+        category (s/capitalize
+                   (s/replace
+                     (s/lower-case
+                       (str (:category record)))
+                     #"[^a-z0-9]" "-"))]
     (if
-      (contains? available (:category record))
-      (str
-        (s/capitalize
-          (s/replace (s/lower-case (str (:category record))) #"[^a-z0-9]" "-")) "-pin")
+      (available category)
+      (str category "-pin")
       "unknown-pin")))
 
 (defn popup-content
   "Appropriate content for the popup of a map pin for this `record`."
   [record]
-  (str
-    "<h5>"
-    (:name record)
-    "</h5><dl>"
-    (apply
-      str
-      (map #(str "<dt>" (name %) "</dt><dd>" (record %) "</dd>") (keys record)))
-    "</dl>"))
+  (if
+    (map? record) ;; which it should be!
+    (str
+      "<h5>"
+      (:name record)
+      "</h5><dl>"
+      (apply
+        str
+        (map
+          #(str "<dt>" (name %) "</dt><dd>" (record %) "</dd>")
+          (filter #(record %) (keys record))))
+      "</dl>")))
 
 (defn popup-table-content
   "Appropriate content for the popup of a map pin for this `record`, as a
   table. Obviously this is semantically wrong, but for styling reasons it's
   worth trying."
   [record]
-  (str
-    "<h5>"
-    (:name record)
-    "</h5><table>"
-    (apply
-      str
-      (map
-        #(str "<tr><th>" (name %) "</th><td>" (record %) "</td></tr>")
-        (sort (keys record))))
-    "</table>"))
+  (if
+    (map? record) ;; which it should be!
+    (str
+      "<h5>"
+      (:name record)
+      "</h5><table>"
+      (apply
+        str
+        (map
+          #(str "<tr><th>" (name %) "</th><td>" (record %) "</td></tr>")
+          (sort (filter #(record %) (keys record)))))
+      "</table>")))
 
 (defn add-map-pin
   "Add an appropriate map-pin for this `record` in this map `view`, if it
   has a valid `:latitude` and `:longitude`."
-  [record index view]
+  [db record index view]
   (let [lat (:latitude record)
         lng (:longitude record)]
     (if
@@ -125,7 +133,7 @@
                        (clj->js
                          {:iconAnchor [16 41]
                           :iconSize [32 42]
-                          :iconUrl (str "img/map-pins/" (pin-image record) ".png")
+                          :iconUrl (str "img/map-pins/" (pin-image db record) ".png")
                           :riseOnHover true
                           :shadowAnchor [16 23]
                           :shadowSize [57 24]
@@ -159,8 +167,8 @@
         data (:data db)]
     (if
       view
-      (let [added (remove nil? (map #(add-map-pin %1 %2 view) data (range)))]
-        (js/console.log (str "Adding " (count added) " pins")))
-      (js/console.log "View is not yet ready"))
-    db))
+      (let [added (remove nil? (map #(add-map-pin db %1 %2 view) data (range)))]
+        (js/console.log (str "Adding " (count added) " pins"))
+        db)
+      (do (js/console.log "View is not yet ready") db))))