Added comments and new template controllers