-HW 2 with templates

Finished everything but a few last tests.

Dallas