Adding dymaincally include templates, trying to get error reporting working better