some good work toward nested pushing of entities