Updated templates.
Initial working version.