add index, rename solver -> solving