High-level notes on remaining post-merge work