Fixed up the indexing... almost showtime