Commit 018: Completion of template