Dino catalog - Revison 2

Nice consistent level of abstraction.