I suspect that Charity may call in a favour soon from Emma (reverse blackmail, just so like Charity to succeed and so like Emma to fail) so that maybe Charity moves into the Barton's house and is rubbing shoulders with Emma, Noah, Moses and Ross. This would be much more fun and dramatic than Charity moving into Butler's Farm, I reckon.