Nov12

Creating pull request for code review. See comments in diff.
This really makes no sense. Again, please, just create the needed entities in the Main class.