Dino catalog

dino catalog PR
Don't use case statements.