WIP:  Getting closer to real genus.