Test catalog

Kip please review. 
Check #103 for details