Completed save mechanism
Edited indexing mechanism