Adding in rest of templates