REmoved the template from the class. Only the constructor and the new close() function are templates.
Moved all non-template functions to the cpp file.