now using jekyll, massive rewrite