added templates, and shit
commit after merge