Lowered dependancy on CalculateIndexes()
Added skeleton functions for JSON import/export.