Work on templates + design structure