Work on the templates, added base template