Working on adopting templates