Flesh out disaggregation
merge master