Fixed Bugs, Added Survey Template Class