BUG:  I think we got the right genus calculation.  Need to do more testing.  Also, fixed problem with painting only original object without any functional overlays.