Mostly the logic part of progeny.  Working my way through a nasty merge.  Doesn't work, of course.
Merge #1