Back to the good 'ol times

Yeah.
Merge branch 'simosBranch' of https://github.com/Llewen/WallaceFarms into simosBranch