Nov12

Creating pull request for code review. See comments in diff.
The only public methods should be for retrieving entity containers. Otherwise, we'll have crazy dependency problems. Keep this in mind.