Clean up TODOs and continue Catalog building and testing work