new WIP

@JorgeFerrer here's the latest that I'm sending to Kamesh to work from. Squished and fixed the Freemarker/include issues.
Yeah, those are fine. I meant _ocdMap. It doesn't seem right, since later changes won't be reflected in this map.