Adding indexes. More need to come. Testing performance.