Adding templates, still some work to do on the styling