diff --git a/Makefile b/Makefile
index 406e846..5997e8c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ remappings :; forge remappings > remappings.txt
 
 # deploy
 # to run: `make deploy rpc="<chain>"` e.g `make deploy rpc="anvil"`
+# to specify a gas price:  make deploy rpc="anvil" gasPrice="--with-gas-price 45000000000 --skip-simulation
 # TODO: compile all contracts at start then run scripts
 deploy:; make \
 	deploy-Globals \
@@ -39,7 +40,6 @@ deploy-Registry:; forge script scripts/core/Registry.s.sol:Deploy --rpc-url $(rp
 deploy-Proxy:; forge script scripts/core/Proxy.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow)
 deploy-AppFactory:; forge script scripts/core/AppFactory.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow)
 
-
 # token implementations
 deploy-ERC721Base:; forge script scripts/tokens/ERC721Base.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow)
 deploy-ERC721LazyMint:; forge script scripts/tokens/ERC721LazyMint.s.sol:Deploy --rpc-url $(rpc) --broadcast $(verbose) $(gasPrice) $(legacy) $(slow)
diff --git a/deployed/137.json b/deployed/137.json
index ccc5b35..7ab9579 100644
--- a/deployed/137.json
+++ b/deployed/137.json
@@ -1,36 +1,4 @@
 {
-  "ERC721Base": {
-    "startBlock": 46050287,
-    "address": "0xF492f60aa5D7c49A43E41f9f8F3730d310974a97"
-  },
-  "Proxy": {
-    "address": "0x2eBF7f4572c218217ca01CE2883E3EfF93626a8E",
-    "startBlock": 46050247
-  },
-  "ERC721LazyMint": {
-    "address": "0x9e9248e65A7FCEA1b12b08af923F231d7b1f66B6",
-    "startBlock": 46050299
-  },
-  "ERC721FactoryFacet": {
-    "startBlock": 46050423,
-    "address": "0x8eF67328a42e658AeaF35f8e127Ae02c762bbEf9"
-  },
-  "ERC20FactoryFacet": {
-    "address": "0xCe9DB0366568b7ec515B6E13DBb9aE2B02bC3E43",
-    "startBlock": 46050468
-  },
-  "Registry": {
-    "startBlock": 46050238,
-    "address": "0xea65bC1DEA1ED6b43efEFA04819F5b94bC574948"
-  },
-  "ERC20Base": {
-    "address": "0xe68Fa7C59fC75bB985EAdaE5A740f0b47c478d8d",
-    "startBlock": 46050258
-  },
-  "SettingsFacet": {
-    "startBlock": 46050323,
-    "address": "0x04D8b9165f00933452D10dE556C04a5234ce3a58"
-  },
   "doNotRemoveUsedToParseFile": [
     "Globals",
     "Registry",
@@ -44,26 +12,63 @@
     "SettingsFacet",
     "ERC721FactoryFacet",
     "ERC20FactoryFacet",
-    "ERC721LazyDropFacet"
+    "ERC721LazyDropFacet",
+    "AppFactory"
   ],
+  "Proxy": {
+    "address": "0x429cB2c2A030952D3F5e10B534584aB49c303763",
+    "startBlock": 55743714
+  },
+  "ERC20FactoryFacet": {
+    "address": "0x87ee1Fbd30ec94d8e3A174e52c319d0E127f7898",
+    "startBlock": 55744025
+  },
   "ConstellationFactory": {
-    "address": "0x0cE3fB93111Dee33cDB59f97e3df84e93adE46DD",
-    "startBlock": 46050271
+    "startBlock": 46050271,
+    "address": "0x0cE3fB93111Dee33cDB59f97e3df84e93adE46DD"
+  },
+  "AppFactory": {
+    "startBlock": 55743736,
+    "address": "0x49c50D754F6118eB02DF6dDaD4a4d6D2a46AD837"
+  },
+  "ERC721Base": {
+    "startBlock": 55743825,
+    "address": "0x0547FD7Ca54f49501c1aa2c4058B0AFA48eaE7Af"
+  },
+  "ERC721FactoryFacet": {
+    "address": "0x49A508CBd7419e5132aB670a0054962A1DA7E322",
+    "startBlock": 55743995
+  },
+  "ERC721LazyDropFacet": {
+    "startBlock": 55744134,
+    "address": "0x811aD13193D4a4d3a16E2e35F7Af57AA288C9AA7"
   },
   "Globals": {
-    "address": "0x451f72Cf4174F15AcFb3AA5feEA9Ec8BE607f9E4",
-    "startBlock": 46050206
+    "startBlock": 55743666,
+    "address": "0x60a0AAbDeb54c37b3dB67251Ad8b3A8Fbb53cAAf"
+  },
+  "Registry": {
+    "startBlock": 55743677,
+    "address": "0x0f9b837652717caEDA5bC4D5912C7BD8467b3E0A"
   },
   "StarFactory": {
-    "address": "0x1e823247D26efd56f5172b8C19F6c44CA700F2c5",
-    "startBlock": 46050253
+    "startBlock": 46050253,
+    "address": "0x1e823247D26efd56f5172b8C19F6c44CA700F2c5"
   },
-  "ERC721LazyDropFacet": {
-    "startBlock": 46050494,
-    "address": "0x4d9D07E924F9bC486d496CacFaf2Bd9C7bC4E22F"
+  "ERC20Base": {
+    "startBlock": 55743757,
+    "address": "0x2Fe4349caC208D84cdcD47edaD4Fb4336Af1D83e"
+  },
+  "ERC721LazyMint": {
+    "address": "0x265A242Bcf4CFd9021A666B427e2d4dce2F5eF54",
+    "startBlock": 55743856
   },
   "RewardFacet": {
-    "startBlock": 46050309,
-    "address": "0x3a75C73042aDe9b219518ca3be59bB4652fd2db5"
+    "address": "0x79a414D9778F5b2353943a9E6b6e3B3026ec932B",
+    "startBlock": 55743910
+  },
+  "SettingsFacet": {
+    "address": "0xe666904373557873d01008CC78A5fA3a2c36866F",
+    "startBlock": 55743963
   }
 }
\ No newline at end of file
diff --git a/deployed/80002.json b/deployed/80002.json
new file mode 100644
index 0000000..0b06bb6
--- /dev/null
+++ b/deployed/80002.json
@@ -0,0 +1,74 @@
+{
+  "ERC721Base": {
+    "address": "0x0Ac51EDA5fC88f5E9955f0F89A65b391C51CA141",
+    "startBlock": 5784040
+  },
+  "ERC721LazyMint": {
+    "address": "0x9E82e59058c4937cb523736255C15411cE707BcF",
+    "startBlock": 5784057
+  },
+  "Registry": {
+    "startBlock": 5783989,
+    "address": "0x7aFE68988db5158B68ce64cEFBe750E5D3539e71"
+  },
+  "Proxy": {
+    "startBlock": 5783999,
+    "address": "0x19781Af95cA4E113D5D1412452225D11A84ce992"
+  },
+  "ERC20Base": {
+    "address": "0x1F2CD226AD558a362026FF7f64F8BE92Ee5Ed8Fd",
+    "startBlock": 5784022
+  },
+  "ConstellationFactory": {
+    "address": "0x4cE72ceB49223A259FA1265Ba3a78484BbE8B889",
+    "startBlock": 5686486
+  },
+  "doNotRemoveUsedToParseFile": [
+    "Globals",
+    "Registry",
+    "Proxy",
+    "StarFactory",
+    "ERC20Base",
+    "ConstellationFactory",
+    "ERC721Base",
+    "ERC721LazyMint",
+    "RewardFacet",
+    "SettingsFacet",
+    "ERC721FactoryFacet",
+    "ERC20FactoryFacet",
+    "ERC721LazyDropFacet",
+    "AppFactory"
+  ],
+  "ERC20FactoryFacet": {
+    "address": "0xc21125b654a1071D9Bc8162C71A71Cd88fD99E85",
+    "startBlock": 5784127
+  },
+  "ERC721LazyDropFacet": {
+    "address": "0x47b5760dDba0D3D80d83fc689D3c5Cb45efe93B4",
+    "startBlock": 5784146
+  },
+  "SettingsFacet": {
+    "startBlock": 5784091,
+    "address": "0x3Fbe54Cc6B5f377830f6DE55a3A9B0f811AAfea9"
+  },
+  "AppFactory": {
+    "address": "0x3713395bd3c11E4D5A688b21cFa3f86D04288861",
+    "startBlock": 5784012
+  },
+  "StarFactory": {
+    "startBlock": 5686457,
+    "address": "0x542D145f2c66CB9ac58447Fe141BFB12fea7C8bE"
+  },
+  "RewardFacet": {
+    "address": "0xaCde8917a4427DcE86aaDF7Bf853e730aa72A398",
+    "startBlock": 5784074
+  },
+  "ERC721FactoryFacet": {
+    "startBlock": 5784110,
+    "address": "0x19145dc9b36DDdd9a874195c6e51f4067aeb796a"
+  },
+  "Globals": {
+    "startBlock": 5783977,
+    "address": "0xcD288D67b371AB590962B2bd8FEd9866d8d6C69d"
+  }
+}
\ No newline at end of file
diff --git a/foundry.toml b/foundry.toml
index 8d44d4b..d1bd817 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -19,4 +19,4 @@ polygon = "${POLYGON_RPC_URL}"
 aurora = "https://mainnet.aurora.dev"
 aurora-testnet = "https://testnet.aurora.dev"
 arbitrum-testnet = "https://sepolia-rollup.arbitrum.io/rpc"
-
+amoy = "https://rpc-amoy.polygon.technology/"