Time to upll feature/harvest into develop

This thing is a monster, just going to merge it in hhh...