Accidently did it in 2 commits rather than one, the catalog that is...