finished implementation of new Template Loaders