Added a __getitem__ method to Catalog.  Now you can put do catalog[unit_id] and get the unit.