Add API and Catalog (wip), revise types, and expressions.