Started to add more to template