Dino catalog-msabdeljalil V2

Version 2, after Joe Mastey review
This `return return` construction is awkward. A ternary might even be acceptable here.