updating template system like lots
Foo
Foo
Foo
Foo
Foo
Foo
Foo
Foo
Updates to templating system. Changing the templates slightly