diff --git a/script/items.js b/script/items.js
index b0488f8..cd06f5f 100644
--- a/script/items.js
+++ b/script/items.js
@@ -1,170 +1,518 @@
 var defaultItemGrid = [
     [
-        "Bow",
+        "SongofTime",
+        "KokiriSword",
+        "Mask",
+        "LightMedallion",
+        "Trade",
         "Hookshot",
+        "Magic",
+        "MinuetofForest",
+        "KokiriBoots",
+        "ZoraTunic",
+        "SongofTime",
+        "KokiriSword",
+        "Mask",
+        "LightMedallion",
+        "Trade",
+        "Hookshot",
+        "Magic",
+        "MinuetofForest",
+        "KokiriBoots",
+        "ZoraTunic",
+    ],
+    [
+        "SunsSong",
+        "Slingshot",
+        "ShadowMedallion",
+        "GoMode",
+        "ForestMedallion",
+        "Bow",
+        "Lens",
+        "BoleroofFire",
+        "KokiriTunic",
+        "GoronTunic",
+        "SunsSong",
+        "Slingshot",
+        "ShadowMedallion",
+        "GoMode",
+        "ForestMedallion",
+        "Bow",
+        "Lens",
+        "BoleroofFire",
+        "KokiriTunic",
+        "GoronTunic"
+    ],
+    [
+        "SariasSong",
+        "Bombs",
+        "SpiritMedallion",
+        "Skulltula",
+        "FireMedallion",
         "Hammer",
+        "MirrorShield",
+        "SerenadeofWater",
+        "DekuShield",
+        "HylianShield",
+        "SariasSong",
         "Bombs",
-        "Bombchus",
+        "SpiritMedallion",
+        "Skulltula",
+        "FireMedallion",
+        "Hammer",
+        "MirrorShield",
+        "SerenadeofWater",
+        "DekuShield",
+        "HylianShield"
+    ],
+    [
+        "EponasSong",
         "Scale",
+        "Bottle",
+        "WaterMedallion",
+        "Farores",
+        "IronBoots",
         "Glove",
+        "RequiemofSpirit",
+        "MasterSword",
+        "StoneofAgony",
+        "EponasSong",
+        "Scale",
+        "Bottle",
+        "WaterMedallion",
+        "Farores",
+        "IronBoots",
+        "Glove",
+        "RequiemofSpirit",
+        "MasterSword",
+        "StoneofAgony"
     ],
     [
-        "KokiriSword",
-        "BiggoronSword",
-        "MirrorShield",
-        "ZoraTunic",
-        "GoronTunic",
-        "IronBoots",
+        "ZeldasLullaby",
+        "ZoraLetter",
+        "KokiriEmerald",
+        "GoronRuby",
+        "ZoraSapphire",
+        "HoverBoots",
+        "Light",
+        "NocturneofShadow",
+        "Nuts",
+        "BigPoe",
+        "ZeldasLullaby",
+        "ZoraLetter",
+        "KokiriEmerald",
+        "GoronRuby",
+        "ZoraSapphire",
         "HoverBoots",
+        "Light",
+        "NocturneofShadow",
+        "Nuts",
+        "BigPoe"
     ],
     [
+        "SongofStorms",
+        "Boomerang",
+        "Bean",
+        "BiggoronSword",
+        "Membership",
         "Dins",
-        "Farores",
-        "Nayrus",
-        "Magic",
         "Fire",
-        "Ice",
-        "Light",
+        "PreludeofLight",
+        "Stick",
+        "Bombchu",
+        "SongofStorms",
+        "Boomerang",
+        "Bean",
+        "BiggoronSword",
+        "Membership",
+        "Dins",
+        "Fire",
+        "PreludeofLight",
+        "Stick",
+        "Bombchu"
     ],
     [
-        "Slingshot",
-        "Boomerang",
-        "Lens",
-        "Ocarina",
-        "Bottle",
-        "ZoraLetter",
-        "Beans",
+        "ForestKey",
+        "FireKey",
+        "WaterKey",
+        "SpiritKey",
+        "ShadowKey",
+        "CastleKey",
+        "GTGKey",
+        "Scarecrow",
+        "Ice",
+        "Nayrus",
+        "ForestKey",
+        "FireKey",
+        "WaterKey",
+        "SpiritKey",
+        "ShadowKey",
+        "CastleKey",
+        "GTGKey",
+        "Scarecrow",
+        "Ice",
+        "Nayrus"
     ],
     [
+        "BossForest",
+        "BossFire",
+        "BossWater",
+        "BossSpirit",
+        "BossShadow",
+        "BossCastle",
+        "WellKey",
+        "Ocarina",
         "Wallet",
-        "Skulltula",
-        "Child",
-        "Adult",
-    ],
+        "Heart",
+        "BossForest",
+        "BossFire",
+        "BossWater",
+        "BossSpirit",
+        "BossShadow",
+        "BossCastle",
+        "WellKey",
+        "Ocarina",
+        "Wallet",
+        "Heart"
+    ]
+]
+
+var default2pItemGrid = [
     [
-        "ZeldasLullaby",
-        "EponasSong",
-        "SunsSong",
-        "SariasSong",
         "SongofTime",
-        "SongofStorms",
+        "KokiriSword",
+        "Mask",
+        "LightMedallion",
+        "Trade",
+        "Hookshot",
+        "Magic",
+        "MinuetofForest",
+        "KokiriBoots",
+        "ZoraTunic",
+        "SongofTime",
+        "KokiriSword",
+        "Mask",
+        "LightMedallion",
+        "Trade",
+        "Hookshot",
+        "Magic",
+        "MinuetofForest",
+        "KokiriBoots",
+        "ZoraTunic",
     ],
     [
-        "MinuetofForest",
+        "SunsSong",
+        "Slingshot",
+        "ShadowMedallion",
+        "GoMode",
+        "ForestMedallion",
+        "Bow",
+        "Lens",
         "BoleroofFire",
-        "SerenadeofWater",
-        "NocturneofShadow",
-        "RequiemofSpirit",
-        "PreludeofLight",
+        "KokiriTunic",
+        "GoronTunic",
+        "SunsSong",
+        "Slingshot",
+        "ShadowMedallion",
+        "GoMode",
+        "ForestMedallion",
+        "Bow",
+        "Lens",
+        "BoleroofFire",
+        "KokiriTunic",
+        "GoronTunic"
     ],
     [
-        "ForestMedallion",
+        "SariasSong",
+        "Bombs",
+        "SpiritMedallion",
+        "Skulltula",
         "FireMedallion",
-        "WaterMedallion",
-        "ShadowMedallion",
+        "Hammer",
+        "MirrorShield",
+        "SerenadeofWater",
+        "DekuShield",
+        "HylianShield",
+        "SariasSong",
+        "Bombs",
         "SpiritMedallion",
-        "LightMedallion",
+        "Skulltula",
+        "FireMedallion",
+        "Hammer",
+        "MirrorShield",
+        "SerenadeofWater",
+        "DekuShield",
+        "HylianShield"
+    ],
+    [
+        "EponasSong",
+        "Scale",
+        "Bottle",
+        "WaterMedallion",
+        "Farores",
+        "IronBoots",
+        "Glove",
+        "RequiemofSpirit",
+        "MasterSword",
+        "StoneofAgony",
+        "EponasSong",
+        "Scale",
+        "Bottle",
+        "WaterMedallion",
+        "Farores",
+        "IronBoots",
+        "Glove",
+        "RequiemofSpirit",
+        "MasterSword",
+        "StoneofAgony"
     ],
     [
+        "ZeldasLullaby",
+        "ZoraLetter",
+        "KokiriEmerald",
+        "GoronRuby",
+        "ZoraSapphire",
+        "HoverBoots",
+        "Light",
+        "NocturneofShadow",
+        "Nuts",
+        "BigPoe",
+        "ZeldasLullaby",
+        "ZoraLetter",
         "KokiriEmerald",
         "GoronRuby",
         "ZoraSapphire",
+        "HoverBoots",
+        "Light",
+        "NocturneofShadow",
+        "Nuts",
+        "BigPoe"
+    ],
+    [
+        "SongofStorms",
+        "Boomerang",
+        "Bean",
+        "BiggoronSword",
+        "Membership",
+        "Dins",
+        "Fire",
+        "PreludeofLight",
+        "Stick",
+        "Bombchu",
+        "SongofStorms",
+        "Boomerang",
+        "Bean",
+        "BiggoronSword",
+        "Membership",
+        "Dins",
+        "Fire",
+        "PreludeofLight",
+        "Stick",
+        "Bombchu"
+    ],
+    [
+        "ForestKey",
+        "FireKey",
+        "WaterKey",
+        "SpiritKey",
+        "ShadowKey",
+        "CastleKey",
+        "GTGKey",
+        "Scarecrow",
+        "Ice",
+        "Nayrus",
+        "ForestKey",
+        "FireKey",
+        "WaterKey",
+        "SpiritKey",
+        "ShadowKey",
+        "CastleKey",
+        "GTGKey",
+        "Scarecrow",
+        "Ice",
+        "Nayrus"
+    ],
+    [
+        "BossForest",
+        "BossFire",
+        "BossWater",
+        "BossSpirit",
+        "BossShadow",
+        "BossCastle",
+        "WellKey",
+        "Ocarina",
+        "Wallet",
+        "Heart",
+        "BossForest",
+        "BossFire",
+        "BossWater",
+        "BossSpirit",
+        "BossShadow",
+        "BossCastle",
+        "WellKey",
+        "Ocarina",
+        "Wallet",
+        "Heart"
     ]
 ]
 
+var items = {
+    Bow:0,
+    Hookshot:0,
+    Hammer:false,
+    Slingshot:0,
+    Boomerang:false,
+    Bombs:0,
+    Lens:false,
+    Dins:false,
+    Farores:false,
+    Nayrus:false,
+    Fire:false,
+    Ice:false,
+    Light:false,
+    Ocarina:1,
+    Bottle:0,
+    Wallet:1,
+    Skulltula:0,
+    Stick:1,
+    Nuts:1,
+    Bombchu:false,
+    Mask:1,
+    Trade:0,
+    Bean:false,
+    Heart:false,
 
-var baseItems = {
-    Bow: 0,
-    Hookshot: 0,
-    Hammer: false,
-    Slingshot: 0,
-    Boomerang: false,
-    Bombs: 0,
-    Bombchus: false,
-    Lens: false,
-    Dins: false,
-    Farores: false,
-    Nayrus: false,
-    Fire: false,
-    Ice: false,
-    Light: false,
-    Ocarina: 0,
-    Bottle: 0,
-    Wallet: 0,
-    Skulltula: 0,
-    Child: 0,
-    Adult: 0,
-
-    KokiriSword: false,
-    BiggoronSword: false,
-    MirrorShield: false,
-    GoronTunic: false,
-    ZoraTunic: false,
-    IronBoots: false,
-    HoverBoots: false,
-    Glove: 0,
-    Scale: 0,
-    StoneofAgony: false,
-    Magic: 0,
-    ZoraLetter: false,
-    Beans: false,
+    KokiriSword:false,
+    MasterSword:1,
+    BiggoronSword:false,
+    DekuShield:false,
+    HylianShield:false,
+    MirrorShield:false,
+    KokiriTunic:true,
+    GoronTunic:false,
+    ZoraTunic:false,
+    KokiriBoots:true,
+    IronBoots:false,
+    HoverBoots:false,
+    Glove:0,
+    Scale:0,
+    StoneofAgony:false,
+    Magic:0,
+    ZoraLetter:false, 
 
-    ZeldasLullaby: false,
-    EponasSong: false,
-    SunsSong: false,
-    SariasSong: false,
-    SongofTime: false,
-    SongofStorms: false,
-    MinuetofForest: false,
-    PreludeofLight: false,
-    BoleroofFire: false,
-    SerenadeofWater: false,
-    NocturneofShadow: false,
-    RequiemofSpirit: false,
+    ZeldasLullaby:false,
+    EponasSong:false,
+    SunsSong:false,
+    SariasSong:false,
+    SongofTime:false,
+    SongofStorms:false,
+    MinuetofForest:false,
+    PreludeofLight:false,
+    BoleroofFire:false,
+    SerenadeofWater:false,
+    NocturneofShadow:false,
+    RequiemofSpirit:false,
+    Scarecrow:0,
 
-    KokiriEmerald: false,
-    GoronRuby: false,
-    ZoraSapphire: false,
-    ForestMedallion: false,
-    FireMedallion: false,
-    WaterMedallion: false,
-    SpiritMedallion: false,
-    ShadowMedallion: false,
-    LightMedallion: false,
+    KokiriEmerald:false,
+    GoronRuby:false,
+    ZoraSapphire:false,
+    ForestMedallion:false,
+    FireMedallion:false,
+    WaterMedallion:false,
+    SpiritMedallion:false,
+    ShadowMedallion:false,
+    LightMedallion:false,
+    BigPoe:0,
+    GoMode:false,
+    
+    ForestKey:0,
+    FireKey:0,
+    WaterKey:0,
+    SpiritKey:0,
+    ShadowKey:0,
+    CastleKey:0,
+    GTGKey:0,
+    WellKey:0,
+    
+    BossForest:0,
+    BossFire:0,
+    BossWater:0,
+    BossSpirit:0,
+    BossShadow:0,
+    BossCastle:0,
+    Membership:false,
 
-    blank: false,
+    blank: false
 };
 
 var itemsMin = {
-    Bow: 0,
-    Slingshot: 0,
-    Bombs: 0,
-    Hookshot: 0,
-    Ocarina: 0,
-    Bottle: 0,
-    Glove: 0,
-    Scale: 0,
-    Magic: 0,
-    Wallet: 0,
-    Skulltula: 0,
-    Child: 0,
-    Adult: 0,
+    Bow:0,
+    Slingshot:0,
+    Bombs:0,    
+    Hookshot:0,
+    Ocarina:0,
+    Bottle:0,
+    Glove:0,
+    Scale:0,
+    Magic:0,
+    Wallet:1,
+    Skulltula:0,
+    Stick:1,
+    Nuts:1,
+    Mask:0,
+    Trade:0,
+    Scarecrow:0,
+    ForestKey:0,
+    FireKey:0,
+    WaterKey:0,
+    SpiritKey:0,
+    ShadowKey:0,
+    CastleKey:0,
+    GTGKey:0,
+    WellKey:0,
+    BossForest:0,
+    BossFire:0,
+    BossWater:0,
+    BossSpirit:0,
+    BossShadow:0,
+    BossCastle:0,
+    BigPoe:0,
+    
+    MasterSword:0.
 };
 
 var itemsMax = {
-    Bow: 3,
-    Slingshot: 3,
-    Bombs: 3,
-    Hookshot: 2,
-    Ocarina: 2,
-    Bottle: 4,
-    Glove: 3,
-    Scale: 2,
-    Magic: 2,
-    Wallet: 2,
-    Skulltula: 6,
-    Child: 8,
-    Adult: 11,
+    Bow:3,
+    Slingshot:3,
+    Bombs:3,    
+    Hookshot:2,
+    Ocarina:2,
+    Bottle:4,
+    Glove:3,
+    Scale:2,
+    Magic:2,
+    Wallet:4,
+    Skulltula:50,
+    Stick:3,
+    Nuts:3,
+    Mask:12,
+    Trade:11,
+    Scarecrow:2,
+    ForestKey:5,
+    FireKey:8,
+    WaterKey:6,
+    SpiritKey:5,
+    ShadowKey:5,
+    CastleKey:2,
+    GTGKey:9,
+    WellKey:3,
+    BossForest:1,
+    BossFire:1,
+    BossWater:1,
+    BossSpirit:1,
+    BossShadow:1,
+    BossCastle:1,
+    BigPoe:10,
+    MasterSword:1,
 };
-
-var items = Object.assign(baseItems);