move more functionality into the template