Dino catalog-msabdeljalil V2

Version 2, after Joe Mastey review
Hiding a return within a ternary is super sneaky, definitely don't do it.