4.1 Add Templates

After finishing adding templates