Changed the way to hande the resolution
Added entity system that does not work correctly yet.