Started work on templates and instances