Added hiccup and started with some templating stuff