marka
committed
on 28 Apr 08
added some more templating and caching