Separated out Index, completed first pass