More templating. Master not working

Placing latest version of code live for Nokioooo