Bring Trek into everything

Having benefited from an education, I do the first one.