- more and more stuff
- working on avoid duplicate enities