Changing RestorMa back to be indexed by cxID. changing some maps --> unordered_maps.
Promoting the inputs and tokenInputs fields to the instruction class