more progress on ContributionStatementApp