Added new template
Added new files.
Fixes.