Templating partie 2

Complete and Continue