Most of the fancy indexing code pass now (still some issues with where() iter though)