Initial merge of Wanderer's Friend (incomplete)