Dinocatalog

Refactored filters, changed mappers to use hash, few other name changes. 
4000 is kind of a magic number here. usual practice is to assign such numbers to a well-named constant, and use the constant in your code instead