master: Generic fold up tested, looks good.
master: had a bug with endgame. Down also tested and confirmed.