Bring Genability up to date

@chrishenzie FYI