More organizing of the concept. using the catalog pattern.