Added new templating engine.. not much work done