More fleshing out of Aulibar #1