maintain entity through put process

@jberkel can you look at this soon? Sets won't be pushed at all until this is merged

Thanks

J