Core/Entities: More research to do