preparing to merge
Added world to assets and renamed InstrumentStub to InstrumentData