Feature/catalog

 #3