finished some TODOs and finished more of the catalog generator logic