Nov12

Creating pull request for code review. See comments in diff.
There's no point in doing, the Entities are not factories. That's the responsibility of main.