A start on #253