move to templar wrappers