Halfway to adding entities (from index for now)