Cleaned up class for stacked df; generate wealth vars