Quantitative Macro with Heterogeneity