Could you merge in Chi Ho's `SummaryActivity` code here?