Mike, since you have more changes I can't commit this...

I added the multiple indices saving whatnot