Template class commit
Final commit before hand-in. Testing functions removed.