Add a couple more templates
Added comments