Finished first round of Templates

Worked through all the errors for the template implementation, not sure
if they are correct. 

Issue #1