Dino catalog-msabdeljalil V2

Version 2, after Joe Mastey review
variable names, stop abbreviating them.