reorg. make objects recursive, not just fields