Added templates everywhere - will test in a second.