Improved templating, switching to unstable doccy.