add most other farm types--mostly working