Started on the template system