Fixed broken merge of last commit.
Finished the class template.