Work on the random entity generator + make some changes to Entities to make it work