switched to EntityKey

Experimental, beware!