Fixed the Entity.  Now use a container instead of metadata.
Removed tmp files.