Seems I was largely right.