Dino catalog3

Refactored simplified Dinodex soution
Good consistent level of abstraction here.