added templates and connected everything
added data