Started moving away from passing contrib to every function