Began modifying index stuff, but got sidetracked with some more extension problems