Updated with generator and farmhouse