new WIP

@JorgeFerrer here's the latest that I'm sending to Kamesh to work from. Squished and fixed the Freemarker/include issues.