Dinocatalog

Refactored filters, changed mappers to use hash, few other name changes. 
i would take this comment out -- it doesn't really tell us anything