Added in main templates, UPdated the main router.