[throwaway23461]

Now also include class, income, and neighborhood data.