starting migration to new entity system