Moved class defs to before code, got rid of unneeded boolean is_cluster, check to see if we should be adding genes