More refactoring of farming1 stuff to be useable for new farming stuff. Added gene type counting functions.