Dinocatalog

Refactored filters, changed mappers to use hash, few other name changes. 
`combined` doesn't specifically describe what this method is doing or returning; rename it to something more descriptive