Good start but how about not handing SS or SSDI out to those who never paid in period.
I think there are spouses who might meet that criteria, and their ex-spouses paid into the fund just so the spouse would have something to live on.