Got Rid of all the Template Stuff