Lots of changes to harvester. Almost there...