added a type of index
started work on new, improved solver!