Incrementing sanely
Fixing a bunch of loose ends
Adapting index to store correct positional data