In the middle of entity/scene/component re-write