Added person window and farm class
Fixed conflict