Entity rewritten.
work-in-progress.