finished part, added templates