Added ability to specify custom index file
Removed done todo comments