Draft of how we can change EntityId

DO NOT MERGE.