Dino catalog

@bwthomas Ready for another review. Thanks!!
Trailing whitespace detected.