switched to non-templated class
switched to non-templated class
fixed include statements
fixed include statements
fixed include statement