Dino catalog/mohammad Attempt 1

Also, this class now has a dozen plus methods. In general, that makes it hard to read and understand a class. I'm not sure these all require separate methods.