diff --git a/README.md b/README.md
index 4dbdea6..b7f6082 100644
--- a/README.md
+++ b/README.md
@@ -7,35 +7,37 @@ data has been indexed by the Graph via the subgraph the SushiSwap team maintains
 
 The below all return a Promise that resolves with the requested results.
 
-1. `sushi.price({¹})` Gets ETH price of Sushi.
-2. `blocks.latestBlock()` Gets the latest block.
-3. `blocks.getBlock({¹})` Gets data for the specified block.
-4. `exchange.token({¹, token_address})` Gets data for specified token.
-5. `exchange.tokens({¹})` Gets data for all tokens.
-6. `exchange.pair({¹, pair_address})` Gets data for specified pair.
-7. `exchange.pairs({¹})` Gets data for all pairs.
-8. `exchange.ethPrice({¹})` Gets USD price of ETH.
-9. `exchange.factory({¹})` Gets all data for the SushiSwap factory.
-10. `exchange.dayData({²})` Gets data for the SushiSwap factory broken down by day.
-11. `exchange.twentyFourHourData({¹})` Gets 24h data for the SushiSwap factory.
-12. `exchange_v1.userHistory({², user_address})` Gets LP history for specified user.
-13. `exchange_v1.userPositions({¹, user_address})` Gets LP positions for specified user.
-14. `masterchef.info({¹})` Gets MasterChef contract info.
-15. `masterchef.pool({¹, pool_id, pool_address})` Gets pool info, either by pool id or by pool address.
-16. `masterchef.pools({¹})` Gets pool info for all pools in MasterChef.
-17. `masterchef.user({¹, user_address})` Gets all pools user has stake in.
-18. `exchange.stakedValue({¹, token_address})` Get pricing info for MasterChef pool.
-19. `bar.info({¹})` Gets SushiBar contract info.
-20. `bar.user({¹, user_address})` Gets SushiBar data for specified user.
-21. `maker.info({¹})` Gets SushiMaker contract info.
-22. `maker.servings({²})` Gets past servings to the bar.
-23. `maker.servers({¹})` Gets servers that have served Sushi to the bar.
-24. `maker.pendingServings({¹})` Gets data on the servings ready to be served to the bar.
-25. `timelock.queuedTxs({²})` Gets queued Timelock transactions.
-26. `timelock.canceledTxs({²})` Gets canceled Timelock transactions.
-27. `timelock.executedTxs({²})` Gets executed Timelock transactions.
-28. `timelock.allTxs({²})` Gets all Timelock transactions.
-29. `lockup.user({¹, user_address})` Gets lockup data for specified user.
+1. `sushi.priceETH({¹})` Gets ETH price of Sushi.
+2. `sushi.priceUSD({¹})` Gets USD price of Sushi.
+3. `blocks.latestBlock()` Gets the latest block.
+4. `blocks.getBlock({¹})` Gets data for the specified block.
+5. `exchange.token({¹, token_address})` Gets data for specified token.
+6. `exchange.tokens({¹})` Gets data for all tokens.
+7. `exchange.pair({¹, pair_address})` Gets data for specified pair.
+8. `exchange.pairs({¹})` Gets data for all pairs.
+9. `exchange.ethPrice({¹})` Gets USD price of ETH.
+10. `exchange.factory({¹})` Gets all data for the SushiSwap factory.
+11. `exchange.dayData({²})` Gets data for the SushiSwap factory broken down by day.
+12. `exchange.twentyFourHourData({¹})` Gets 24h data for the SushiSwap factory.
+13. `exchange_v1.userHistory({², user_address})` Gets LP history for specified user.
+14. `exchange_v1.userPositions({¹, user_address})` Gets LP positions for specified user.
+15. `masterchef.info({¹})` Gets MasterChef contract info.
+16. `masterchef.pool({¹, pool_id, pool_address})` Gets pool info, either by pool id or by pool address.
+17. `masterchef.pools({¹})` Gets pool info for all pools in MasterChef.
+18. `masterchef.user({¹, user_address})` Gets all pools user has stake in.
+19. `masterchef.apys({¹})` Gets pool info for all pools in MasterChef including APYs.
+20. `exchange.stakedValue({¹, token_address})` Get pricing info for MasterChef pool.
+21. `bar.info({¹})` Gets SushiBar contract info.
+22. `bar.user({¹, user_address})` Gets SushiBar data for specified user.
+23. `maker.info({¹})` Gets SushiMaker contract info.
+24. `maker.servings({²})` Gets past servings to the bar.
+25. `maker.servers({¹})` Gets servers that have served Sushi to the bar.
+26. `maker.pendingServings({¹})` Gets data on the servings ready to be served to the bar.
+27. `timelock.queuedTxs({²})` Gets queued Timelock transactions.
+28. `timelock.canceledTxs({²})` Gets canceled Timelock transactions.
+29. `timelock.executedTxs({²})` Gets executed Timelock transactions.
+30. `timelock.allTxs({²})` Gets all Timelock transactions.
+31. `lockup.user({¹, user_address})` Gets lockup data for specified user.
 
 ¹ `{block, timestamp}` Supports fetching at a specific block / UNIX timestamp.    
 ² `{minBlock, maxBlock, minTimestamp, maxTimestamp}` Supports fetching in a specific timeframe.
@@ -43,7 +45,7 @@ The below all return a Promise that resolves with the requested results.
 ## Supported Subscriptions
 The below all return an Observable that when subscribed to with an object.
 
-1. `sushi.observePrice()` Gets an observable of the current ETH price of Sushi.
+1. `sushi.observePriceETH()` Gets an observable of the current ETH price of Sushi.
 2. `blocks.observeLatestBlock()` Gets an observable of the latest block.
 3. `exchange.observeToken({token_address})` Gets an observable for specified token.
 4. `exchange.observeTokens()` Gets an observable for the top 1000 tokens (by volume in USD).
diff --git a/index.d.ts b/index.d.ts
index 8f28329..b05526c 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -7,6 +7,7 @@ import bar = require("./typings/bar");
 import maker = require("./typings/maker");
 import timelock = require("./typings/timelock");
 import lockup = require("./typings/lockup");
+import utils = require("./typings/utils")
 
 export = SushiData;
 export as namespace SushiData;
@@ -19,5 +20,5 @@ declare namespace SushiData {
         target: Function;
     }, targetArguments?: any): Promise<any>;
 
-    export { sushi, blocks, exchange, exchange_v1, masterchef, bar, maker, timelock, lockup };
+    export { sushi, blocks, exchange, exchange_v1, masterchef, bar, maker, timelock, lockup, utils };
 }
\ No newline at end of file
diff --git a/index.js b/index.js
index 14f5ecf..f9b74f6 100644
--- a/index.js
+++ b/index.js
@@ -14,7 +14,8 @@ const masterchef = require('./queries/masterchef');
 const bar = require('./queries/bar')
 const maker = require('./queries/maker')
 const timelock =  require('./queries/timelock');
-const lockup = require('./queries/lockup')
+const lockup = require('./queries/lockup');
+const utils = require('./utils');
 
 module.exports = {
 	pageResults,
@@ -28,6 +29,7 @@ module.exports = {
 	maker,
 	timelock,
 	lockup,
+	utils,
 	async timeseries({blocks = undefined, timestamps = undefined, target = undefined} = {}, targetArguments) {
 		if(!target) { throw new Error("sushi-data: Target function undefined"); }
 		if(!blocks && !timestamps) { throw new Error("sushi-data: Timeframe undefined"); }
diff --git a/package-lock.json b/package-lock.json
index 24b5c44..4613009 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,31 +1,31 @@
 {
 	"name": "@sushiswap/sushi-data",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
 		"@babel/code-frame": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-			"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+			"integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
 			"dev": true,
 			"requires": {
-				"@babel/highlight": "^7.10.4"
+				"@babel/highlight": "^7.12.13"
 			}
 		},
 		"@babel/helper-validator-identifier": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-			"integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+			"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
 			"dev": true
 		},
 		"@babel/highlight": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-			"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
+			"integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.10.4",
+				"@babel/helper-validator-identifier": "^7.12.11",
 				"chalk": "^2.0.0",
 				"js-tokens": "^4.0.0"
 			}
@@ -326,13 +326,15 @@
 			"dev": true
 		},
 		"array-includes": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-			"integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz",
+			"integrity": "sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==",
 			"dev": true,
 			"requires": {
+				"call-bind": "^1.0.0",
 				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0",
+				"es-abstract": "^1.18.0-next.1",
+				"get-intrinsic": "^1.0.1",
 				"is-string": "^1.0.5"
 			}
 		},
@@ -491,9 +493,9 @@
 			}
 		},
 		"base64-js": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-			"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
 			"dev": true
 		},
 		"big.js": {
@@ -503,22 +505,12 @@
 			"dev": true
 		},
 		"binary-extensions": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-			"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
 			"dev": true,
 			"optional": true
 		},
-		"bindings": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"file-uri-to-path": "1.0.0"
-			}
-		},
 		"bluebird": {
 			"version": "3.7.2",
 			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -613,21 +605,13 @@
 			}
 		},
 		"browserify-rsa": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-			"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.1.0",
+				"bn.js": "^5.0.0",
 				"randombytes": "^2.0.1"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-					"dev": true
-				}
 			}
 		},
 		"browserify-sign": {
@@ -744,6 +728,16 @@
 				"unset-value": "^1.0.0"
 			}
 		},
+		"call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2"
+			}
+		},
 		"callsites": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -774,20 +768,20 @@
 			"dev": true
 		},
 		"chokidar": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-			"integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+			"integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
 			"dev": true,
 			"optional": true,
 			"requires": {
 				"anymatch": "~3.1.1",
 				"braces": "~3.0.2",
-				"fsevents": "~2.1.2",
+				"fsevents": "~2.3.1",
 				"glob-parent": "~5.1.0",
 				"is-binary-path": "~2.1.0",
 				"is-glob": "~4.0.1",
 				"normalize-path": "~3.0.0",
-				"readdirp": "~3.4.0"
+				"readdirp": "~3.5.0"
 			},
 			"dependencies": {
 				"braces": {
@@ -1152,10 +1146,15 @@
 			"integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
 			"dev": true
 		},
+		"date-fns": {
+			"version": "2.17.0",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.17.0.tgz",
+			"integrity": "sha512-ZEhqxUtEZeGgg9eHNSOAJ8O9xqSgiJdrL0lzSSfMF54x6KXWJiOH/xntSJ9YomJPrYH/p08t6gWjGWq1SDJlSA=="
+		},
 		"debug": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-			"integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+			"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 			"dev": true,
 			"requires": {
 				"ms": "2.1.2"
@@ -1303,18 +1302,18 @@
 			}
 		},
 		"elliptic": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-			"integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+			"version": "6.5.4",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.4.0",
-				"brorand": "^1.0.1",
+				"bn.js": "^4.11.9",
+				"brorand": "^1.1.0",
 				"hash.js": "^1.0.0",
-				"hmac-drbg": "^1.0.0",
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.0"
+				"hmac-drbg": "^1.0.1",
+				"inherits": "^2.0.4",
+				"minimalistic-assert": "^1.0.1",
+				"minimalistic-crypto-utils": "^1.0.1"
 			},
 			"dependencies": {
 				"bn.js": {
@@ -1347,9 +1346,9 @@
 			}
 		},
 		"enhanced-resolve": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz",
-			"integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==",
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+			"integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
 			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
@@ -1370,9 +1369,9 @@
 			}
 		},
 		"errno": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-			"integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+			"integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
 			"dev": true,
 			"requires": {
 				"prr": "~1.0.1"
@@ -1388,22 +1387,25 @@
 			}
 		},
 		"es-abstract": {
-			"version": "1.17.7",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-			"integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+			"version": "1.18.0-next.2",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz",
+			"integrity": "sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==",
 			"dev": true,
 			"requires": {
+				"call-bind": "^1.0.2",
 				"es-to-primitive": "^1.2.1",
 				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2",
 				"has": "^1.0.3",
 				"has-symbols": "^1.0.1",
 				"is-callable": "^1.2.2",
+				"is-negative-zero": "^2.0.1",
 				"is-regex": "^1.1.1",
-				"object-inspect": "^1.8.0",
+				"object-inspect": "^1.9.0",
 				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.1",
-				"string.prototype.trimend": "^1.0.1",
-				"string.prototype.trimstart": "^1.0.1"
+				"object.assign": "^4.1.2",
+				"string.prototype.trimend": "^1.0.3",
+				"string.prototype.trimstart": "^1.0.3"
 			}
 		},
 		"es-to-primitive": {
@@ -1628,9 +1630,9 @@
 			"dev": true
 		},
 		"esquery": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-			"integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
 			"dev": true,
 			"requires": {
 				"estraverse": "^5.1.0"
@@ -1918,13 +1920,6 @@
 				"flat-cache": "^2.0.1"
 			}
 		},
-		"file-uri-to-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-			"dev": true,
-			"optional": true
-		},
 		"fill-range": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -2115,9 +2110,9 @@
 			"dev": true
 		},
 		"fsevents": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-			"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
 			"dev": true,
 			"optional": true
 		},
@@ -2139,6 +2134,17 @@
 			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true
 		},
+		"get-intrinsic": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"has-symbols": "^1.0.1"
+			}
+		},
 		"get-stdin": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
@@ -2226,17 +2232,24 @@
 			"dev": true
 		},
 		"graceful-fs": {
-			"version": "4.2.4",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-			"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+			"version": "4.2.5",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.5.tgz",
+			"integrity": "sha512-kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw==",
 			"dev": true
 		},
 		"graph-results-pager": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/graph-results-pager/-/graph-results-pager-1.0.2.tgz",
-			"integrity": "sha512-NHhaZMEOwRh+2HfH8suKXs6+MTmsTXNbiS+jJ0r7n5jq7VqAnRXdh/JcYEsVK+oqpTsUIIxGl8uHVqmz/8vtkg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/graph-results-pager/-/graph-results-pager-1.0.3.tgz",
+			"integrity": "sha512-Dxh58jIlkhiK+siS0B45eGBc8dk1rukaJOGqLMgrst7bIYpJ52zxhHht6FhxX5JbVyXzmbXqecztr659ir0C6Q==",
 			"requires": {
-				"node-fetch": "2.6.0"
+				"node-fetch": "2.6.1"
+			},
+			"dependencies": {
+				"node-fetch": {
+					"version": "2.6.1",
+					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+					"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+				}
 			}
 		},
 		"graphql": {
@@ -2392,9 +2405,9 @@
 			}
 		},
 		"ieee754": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
 			"dev": true
 		},
 		"iferr": {
@@ -2410,9 +2423,9 @@
 			"dev": true
 		},
 		"import-fresh": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-			"integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
 			"dev": true,
 			"requires": {
 				"parent-module": "^1.0.0",
@@ -2512,9 +2525,9 @@
 			"dev": true
 		},
 		"ini": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
 			"dev": true
 		},
 		"inquirer": {
@@ -2610,11 +2623,20 @@
 			"dev": true
 		},
 		"is-callable": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-			"integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+			"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
 			"dev": true
 		},
+		"is-core-module": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+			"integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+			"dev": true,
+			"requires": {
+				"has": "^1.0.3"
+			}
+		},
 		"is-data-descriptor": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -2688,9 +2710,9 @@
 			}
 		},
 		"is-negative-zero": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
-			"integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+			"integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
 			"dev": true
 		},
 		"is-number": {
@@ -2723,11 +2745,12 @@
 			}
 		},
 		"is-regex": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-			"integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+			"integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
 			"dev": true,
 			"requires": {
+				"call-bind": "^1.0.2",
 				"has-symbols": "^1.0.1"
 			}
 		},
@@ -2799,9 +2822,9 @@
 			"dev": true
 		},
 		"js-yaml": {
-			"version": "3.14.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-			"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"dev": true,
 			"requires": {
 				"argparse": "^1.0.7",
@@ -3167,13 +3190,6 @@
 			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
 			"dev": true
 		},
-		"nan": {
-			"version": "2.14.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-			"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-			"dev": true,
-			"optional": true
-		},
 		"nanomatch": {
 			"version": "1.2.13",
 			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -3321,9 +3337,9 @@
 			}
 		},
 		"object-inspect": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-			"integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+			"integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
 			"dev": true
 		},
 		"object-keys": {
@@ -3342,37 +3358,15 @@
 			}
 		},
 		"object.assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-			"integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+			"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
 			"dev": true,
 			"requires": {
+				"call-bind": "^1.0.0",
 				"define-properties": "^1.1.3",
-				"es-abstract": "^1.18.0-next.0",
 				"has-symbols": "^1.0.1",
 				"object-keys": "^1.1.1"
-			},
-			"dependencies": {
-				"es-abstract": {
-					"version": "1.18.0-next.1",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-					"integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-					"dev": true,
-					"requires": {
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.1",
-						"is-callable": "^1.2.2",
-						"is-negative-zero": "^2.0.0",
-						"is-regex": "^1.1.1",
-						"object-inspect": "^1.8.0",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.1",
-						"string.prototype.trimend": "^1.0.1",
-						"string.prototype.trimstart": "^1.0.1"
-					}
-				}
 			}
 		},
 		"object.pick": {
@@ -3385,14 +3379,14 @@
 			}
 		},
 		"object.values": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-			"integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz",
+			"integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==",
 			"dev": true,
 			"requires": {
+				"call-bind": "^1.0.0",
 				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1",
-				"function-bind": "^1.1.1",
+				"es-abstract": "^1.18.0-next.1",
 				"has": "^1.0.3"
 			}
 		},
@@ -3826,9 +3820,9 @@
 			}
 		},
 		"readdirp": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-			"integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+			"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
 			"dev": true,
 			"optional": true,
 			"requires": {
@@ -3883,11 +3877,12 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
 			"dev": true,
 			"requires": {
+				"is-core-module": "^2.1.0",
 				"path-parse": "^1.0.6"
 			}
 		},
@@ -4174,6 +4169,12 @@
 					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
 					"dev": true
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
 				}
 			}
 		},
@@ -4255,9 +4256,9 @@
 			"dev": true
 		},
 		"source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true
 		},
 		"source-map-resolve": {
@@ -4281,20 +4282,12 @@
 			"requires": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
 		"source-map-url": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+			"integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
 			"dev": true
 		},
 		"spdx-correct": {
@@ -4324,9 +4317,9 @@
 			}
 		},
 		"spdx-license-ids": {
-			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
-			"integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==",
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
+			"integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
 			"dev": true
 		},
 		"split-string": {
@@ -4424,23 +4417,23 @@
 			}
 		},
 		"string.prototype.trimend": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-			"integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
+			"integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
 			"dev": true,
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.5"
+				"call-bind": "^1.0.0",
+				"define-properties": "^1.1.3"
 			}
 		},
 		"string.prototype.trimstart": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-			"integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
+			"integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
 			"dev": true,
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.5"
+				"call-bind": "^1.0.0",
+				"define-properties": "^1.1.3"
 			}
 		},
 		"string_decoder": {
@@ -4577,12 +4570,6 @@
 					"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
 					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
 					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
 				}
 			}
 		},
@@ -4601,14 +4588,6 @@
 				"terser": "^4.1.2",
 				"webpack-sources": "^1.4.0",
 				"worker-farm": "^1.7.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
 		"text-table": {
@@ -4634,9 +4613,9 @@
 			}
 		},
 		"timers-browserify": {
-			"version": "2.0.11",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-			"integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+			"version": "2.0.12",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
 			"dev": true,
 			"requires": {
 				"setimmediate": "^1.0.4"
@@ -4824,9 +4803,9 @@
 			"optional": true
 		},
 		"uri-js": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
-			"integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
 			"dev": true,
 			"requires": {
 				"punycode": "^2.1.0"
@@ -4908,21 +4887,21 @@
 			"dev": true
 		},
 		"watchpack": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
-			"integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
+			"version": "1.7.5",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+			"integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
 			"dev": true,
 			"requires": {
 				"chokidar": "^3.4.1",
 				"graceful-fs": "^4.1.2",
 				"neo-async": "^2.5.0",
-				"watchpack-chokidar2": "^2.0.0"
+				"watchpack-chokidar2": "^2.0.1"
 			}
 		},
 		"watchpack-chokidar2": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-			"integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+			"integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
 			"dev": true,
 			"optional": true,
 			"requires": {
@@ -4985,11 +4964,7 @@
 					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
 					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
 					"dev": true,
-					"optional": true,
-					"requires": {
-						"bindings": "^1.5.0",
-						"nan": "^2.12.1"
-					}
+					"optional": true
 				},
 				"glob-parent": {
 					"version": "3.1.0",
@@ -5135,14 +5110,6 @@
 			"requires": {
 				"source-list-map": "^2.0.0",
 				"source-map": "~0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
 		"which": {
@@ -5244,9 +5211,9 @@
 			"dev": true
 		},
 		"y18n": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-			"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+			"integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
 			"dev": true
 		},
 		"yallist": {
diff --git a/package.json b/package.json
index bbbe70a..b1c4991 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@sushiswap/sushi-data",
 	"license": "MIT",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"author": "SushiSwap",
 	"main": "index",
 	"scripts": {
@@ -13,6 +13,7 @@
 		"bluebird": "^3.7.2",
 		"commander": "6.1.0",
 		"csv-stringify": "5.3.3",
+		"date-fns": "^2.17.0",
 		"graph-results-pager": "~1.0.0",
 		"graphql": "14.5.8",
 		"graphql-request": "^3.4.0",
diff --git a/queries/maker.js b/queries/maker.js
index da70f81..156e985 100644
--- a/queries/maker.js
+++ b/queries/maker.js
@@ -177,7 +177,6 @@ const pendingServings = {
     ],
 
     callback(results) {
-        console.log(results[0].liquidityPositions.length)
         return results[0].liquidityPositions.map(({ liquidityTokenBalance, pair }) => ({
             address: pair.id,
             token0: pair.token0,
diff --git a/queries/masterchef.js b/queries/masterchef.js
index 86ad56c..53bd06b 100644
--- a/queries/masterchef.js
+++ b/queries/masterchef.js
@@ -3,7 +3,10 @@ const pageResults = require('graph-results-pager');
 const { request, gql } = require('graphql-request');
 
 const { graphAPIEndpoints, chefAddress } = require('./../constants')
-const { timestampToBlock } = require('./../utils');
+const { timestampToBlock, getAverageBlockTime } = require('./../utils');
+
+const { pairs: exchangePairs } = require('./exchange');
+const { priceUSD: sushiPriceUSD } = require('./sushi');
 
 module.exports = {
     async info({block = undefined, timestamp = undefined} = {}) {
@@ -102,6 +105,29 @@ module.exports = {
         })
             .then(results => user.callback(results))
             .catch(err => console.log(err));
+    },
+
+    async apys({block = undefined, timestamp = undefined} = {}) {
+        const masterchefList = await module.exports.pools({block, timestamp});
+        const exchangeList = await exchangePairs({block, timestamp});
+        const sushiUSD = await sushiPriceUSD({block, timestamp});
+
+        const totalAllocPoint = masterchefList.reduce((a, b) => a + b.allocPoint, 0);
+
+        const averageBlockTime = await getAverageBlockTime({block, timestamp});
+
+        return masterchefList.map(masterchefPool => {
+            const exchangePool = exchangeList.find(e => e.id === masterchefPool.pair);
+            if(!exchangePool) {
+                return {...masterchefPool, apy: 0};
+            }
+
+            const tvl = masterchefPool.slpBalance * (exchangePool.reserveUSD / exchangePool.totalSupply);
+            const sushiPerBlock = (masterchefPool.allocPoint / (totalAllocPoint) * 100);
+            const apy = sushiUSD * (sushiPerBlock * (60 / averageBlockTime) * 60 * 24 * 365) / tvl * 100 * 3; // *3 => vesting
+
+            return {...masterchefPool, apy};
+        });
     }
 }
 
diff --git a/queries/sushi.js b/queries/sushi.js
index dea0c04..630ba46 100644
--- a/queries/sushi.js
+++ b/queries/sushi.js
@@ -8,8 +8,14 @@ const { gql } = require('graphql-request');
 const { graphAPIEndpoints, graphWSEndpoints, sushiAddress } = require('./../constants')
 const { timestampToBlock } = require('./../utils')
 
+const { ethPrice } = require('./exchange')
+
 module.exports = {
-    async price({block = undefined, timestamp = undefined} = {}) {
+    async priceUSD({block = undefined, timestamp = undefined} = {}) {
+        return (await ethPrice({block, timestamp}) * (await module.exports.priceETH({block, timestamp})));
+    },
+
+    async priceETH({block = undefined, timestamp = undefined} = {}) {
         return pageResults({
             api: graphAPIEndpoints.exchange,
             query: {
@@ -20,14 +26,14 @@ module.exports = {
                     },
                     block: block ? { number: block } : timestamp ? { number: await timestampToBlock(timestamp) } : undefined,
                 },
-                properties: price.properties,
+                properties: priceETH.properties,
             }
         })
-            .then(results => price.callback(results[0]))
+            .then(results => priceETH.callback(results[0]))
             .catch(err => console.error(err));
     },
 
-    observePrice() {
+    observePriceETH() {
         const query = gql`
             subscription {
                     token(id: "${sushiAddress}") {
@@ -42,17 +48,17 @@ module.exports = {
             subscribe({next, error, complete}) {
                 return observable.subscribe({
                     next(results) {
-                        next(price.callback(results.data.token));
+                        next(priceETH.callback(results.data.token));
                     },
                     error,
                     complete
                 });
             }
         };
-    }
+    },
 }
 
-const price = {
+const priceETH = {
     properties: [
         'derivedETH'
     ],
diff --git a/typings/masterchef.d.ts b/typings/masterchef.d.ts
index 7e141b2..86eab41 100755
--- a/typings/masterchef.d.ts
+++ b/typings/masterchef.d.ts
@@ -101,4 +101,11 @@ export function user({ block, timestamp, user_address }: {
     block?: number;
     timestamp?: number;
     user_address: string;
-}): Promise<User[]>;
\ No newline at end of file
+}): Promise<User[]>;
+
+
+
+export function apys({ block, timestamp}?: {
+    block?: number;
+    timestamp?: number;
+}): Promise<(Pool & {apy: number})[]>;
\ No newline at end of file
diff --git a/typings/sushi.d.ts b/typings/sushi.d.ts
index 1d4a1b8..5718be5 100755
--- a/typings/sushi.d.ts
+++ b/typings/sushi.d.ts
@@ -1,11 +1,16 @@
 type Price = number;
 
-export function price({ block, timestamp }?: {
+export function priceUSD({ block, timestamp }?: {
     block?: number;
     timestamp?: number;
 }): Promise<Price>;
 
-export function observePrice(): {
+export function priceETH({ block, timestamp }?: {
+    block?: number;
+    timestamp?: number;
+}): Promise<Price>;
+
+export function observePriceETH(): {
     subscribe({ next, error, complete }: {
         next?(data: Price): any;
         error?(error: any): any;
diff --git a/typings/utils.d.ts b/typings/utils.d.ts
new file mode 100644
index 0000000..43c2883
--- /dev/null
+++ b/typings/utils.d.ts
@@ -0,0 +1,8 @@
+export function timestampToBlock(timestmap: number): Promise<Number>;
+
+export function blockToTimestamp(block: number): Promise<Number>;
+
+export function getAverageBlockTime({ block, timestamp }?: {
+    block?: number;
+    timestamp?: number;
+}): Promise<Number>;
\ No newline at end of file
diff --git a/utils.js b/utils.js
index 8c20f4d..cc01ca4 100644
--- a/utils.js
+++ b/utils.js
@@ -1,6 +1,16 @@
+const pageResults = require('graph-results-pager');
+
 const { request, gql } = require('graphql-request');
 const blocklytics = 'https://api.thegraph.com/subgraphs/name/blocklytics/ethereum-blocks';
 
+const {
+    getUnixTime,
+    startOfHour,
+    startOfMinute,
+    startOfSecond,
+    subHours,
+  } = require("date-fns");
+
 async function timestampToBlock(timestamp) {
     timestamp = String(timestamp).length > 10 ? Math.floor(timestamp / 1000) : timestamp;
 
@@ -38,7 +48,57 @@ async function blockToTimestamp(block) {
     return Number(result.blocks[0].timestamp);
 }
 
+async function getAverageBlockTime({block = undefined, timestamp = undefined} = {}) {
+
+    timestamp = timestamp ? String(timestamp).length > 10 ? Math.floor(timestamp / 1000) : timestamp : undefined;
+    timestamp = timestamp ? timestamp : block ? await blockToTimestamp(block) : undefined;
+
+    const now = startOfSecond(startOfMinute(startOfHour(timestamp ? timestamp * 1000 : Date.now())));
+    const start = getUnixTime(subHours(now, 6));
+    const end = getUnixTime(now);
+
+    const blocks = await pageResults({
+        api: blocklytics,
+        query: {
+            entity: 'blocks',
+            selection: {
+                orderBy: "number",
+                orderDirection: "desc",
+                where: {
+                    timestamp_gte: start,
+                    timestamp_lte: end
+                }
+            },
+            properties: [
+                'timestamp'
+            ]
+        }
+    })
+
+    const averageBlockTime = blocks.reduce(
+        (previousValue, currentValue, currentIndex) => {
+        if (previousValue.timestamp) {
+            const difference = previousValue.timestamp - currentValue.timestamp;
+
+            previousValue.difference = previousValue.difference + difference;
+        }
+
+        previousValue.timestamp = currentValue.timestamp;
+
+        if (currentIndex === blocks.length - 1) {
+            return previousValue.difference / blocks.length;
+        }
+
+        return previousValue;
+        },
+        { timestamp: null, difference: 0 }
+    );
+
+    return averageBlockTime;
+}
+
 module.exports = {
     timestampToBlock,
     blockToTimestamp,
+    getAverageBlockTime,
 };
\ No newline at end of file