Back to DEV and better templating