added some more templates, finished conversion put