diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 659d038..0673a4c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,11 +1,5 @@
 name: Deploy to GitHub Pages
 
-
-on:
-  push:
-    branches: 'main'
-
-
 jobs:
   build_site:
     runs-on: ubuntu-latest
diff --git a/src/lib/component/Textarea.svelte b/src/lib/component/Textarea.svelte
index cad3b2a..6818d0e 100644
--- a/src/lib/component/Textarea.svelte
+++ b/src/lib/component/Textarea.svelte
@@ -2,7 +2,8 @@
     export let text: string;
     export let bindValue: string | number | undefined;
     export let forValue: string;
-    export let required: boolean = false;;
+    export let required: boolean = false;
+	export let disabled: boolean = false;
 </script>
 
 <div class="flex gap-4 justify-between max-w-lg">
@@ -10,6 +11,7 @@
 	<textarea
 		required={required}
 		id={forValue}
+		disabled={disabled}
 		rows="10"
 		bind:value={bindValue}
 		class="text-right text-black p-2 w-96 rounded-md border border-black dark:border-none"
diff --git a/src/lib/helpers/util.ts b/src/lib/helpers/utils.ts
similarity index 100%
rename from src/lib/helpers/util.ts
rename to src/lib/helpers/utils.ts
diff --git a/src/lib/loadStorage.ts b/src/lib/loadStorage.ts
index 2b74f9b..d3881ca 100644
--- a/src/lib/loadStorage.ts
+++ b/src/lib/loadStorage.ts
@@ -1,6 +1,6 @@
 export function loadStorage(key: string) {
     switch (key) {
-        case 'stationJDJ':
+        case 'junkdajunkRarities':
             return {
                 common: Number(localStorage.getItem(`${key}Common`)) || 0.5,
                 uncommon: Number(localStorage.getItem(`${key}Uncommon`)) || 1,
diff --git a/src/routes/tools/approval/+page.svelte b/src/routes/tools/approval/+page.svelte
index 86289a1..5380fdf 100644
--- a/src/routes/tools/approval/+page.svelte
+++ b/src/routes/tools/approval/+page.svelte
@@ -2,7 +2,6 @@
 	import { onDestroy, onMount } from 'svelte';
 	import { parser, sleep } from '$lib/globals';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Buttons from '$lib/component/Buttons.svelte';
 	import Input from '$lib/component/Input.svelte';
@@ -10,15 +9,25 @@
 	import { handleDownload } from '$lib/download';
 	import Select from '$lib/component/Select.svelte';
 	const abortController = new AbortController();
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	let progress = "";
-	let main = "";
     let content = "";
 	let downloadable = false;
-    let council = "General Assembly";
-	let proposalid = "";
-	onMount(() => ({main, council, proposalid} = loadLocalStorage(["stationMain", "stationCouncil", "stationProposalID"])));
+
+	let main: string;
+    let council: string;
+	let proposalid: string;
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		council = data.parameters.council || loadStorage("approvalCouncil") as string || "General Assembly";
+		proposalid = data.parameters.proposal || loadStorage("approvalProposal") as string || "";
+	});
 	onDestroy(() => abortController.abort() );
 	async function approvals() {
+		pushHistory(`?main=${main}&council=${council}&proposal=${proposalid}`)
         downloadable = false;
         let councilID = 1;
         if (council === "Security Council") {
@@ -84,7 +93,7 @@
 			<label class="w-24" for="mode">Council</label>
 			<Select bind:mode={council} options={['General Assembly', 'Security Council']} />
 		</div>
-		<Input text="Proposal ID" bind:bindValue={proposalid} forValue="proposalID" required={false} />
+		<Input text="Proposal ID" bind:bindValue={proposalid} forValue="proposalID" required={true} />
 		<Buttons>
 			<button disabled={!downloadable} type="button" on:click={() => handleDownload('html', htmlContent(content), 'Approvals')}
 				class="bg-green-500 rounded-md px-4 py-2 transition duration-300 hover:bg-green-300 disabled:opacity-20 disabled:hover:bg-green-500">
diff --git a/src/routes/tools/containerise/+page.svelte b/src/routes/tools/containerise/+page.svelte
index d2abc49..97a927e 100644
--- a/src/routes/tools/containerise/+page.svelte
+++ b/src/routes/tools/containerise/+page.svelte
@@ -1,9 +1,7 @@
 <script lang="ts">
 	import { handleDownload } from '$lib/download';
 	import { nsIterator } from '$lib/txtIterator';
-	import { onMount } from 'svelte';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Buttons from '$lib/component/Buttons.svelte';
 	import Textarea from '$lib/component/Textarea.svelte';
@@ -11,9 +9,8 @@
 	let puppets = '';
 	let content: Array<string>;
 	let downloadable = false;
-	onMount(() => ({puppets} = loadLocalStorage(["stationPuppets"])));
 
-	async function containerise(puppets: string) {
+	async function containerise() {
 		downloadable = false;
 		content = (await nsIterator(puppets, 'Container Rules')) as Array<string>;
 		progress = `<p>Finished processing</p>`;
@@ -43,7 +40,7 @@
 </p>
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
-	<form on:submit|preventDefault={() => containerise(puppets)} class="flex flex-col gap-8">
+	<form on:submit|preventDefault={() => containerise()} class="flex flex-col gap-8">
 		<Textarea text="Puppets" bind:bindValue={puppets} forValue="pup" required />
 		<Buttons>
 			<button disabled={!downloadable} on:click={() => handleDownload('txt', content, '')}
diff --git a/src/routes/tools/containerise/+server.ts b/src/routes/tools/containerise/+server.ts
new file mode 100644
index 0000000..c8cacf0
--- /dev/null
+++ b/src/routes/tools/containerise/+server.ts
@@ -0,0 +1 @@
+export const prerender = true;
\ No newline at end of file
diff --git a/src/routes/tools/creation/+page.svelte b/src/routes/tools/creation/+page.svelte
index 0a4b20f..c020bbd 100644
--- a/src/routes/tools/creation/+page.svelte
+++ b/src/routes/tools/creation/+page.svelte
@@ -2,27 +2,24 @@
 	import { handleDownload } from '$lib/download';
 	import { htmlContent } from '$lib/htmlContent';
 	import { nsIterator } from '$lib/txtIterator';
-	import { onMount } from 'svelte';
-	import InputCredentials from '$lib/component/InputCredentials.svelte';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Buttons from '$lib/component/Buttons.svelte';
+	import Textarea from '$lib/component/Textarea.svelte';
 	let progress = "";
-	let puppets = '';
-	let main = '';
 	let content: string;
 	let downloadable = false;
-	onMount(() => ({puppets, main} = loadLocalStorage(["stationPuppets", "stationMain"])));
+
+	let puppets = '';
 	async function login(puppets: string) {
 		downloadable = false;
-		content = (await nsIterator(puppets, 'Creator', main)) as string;
+		content = (await nsIterator(puppets, 'Creator')) as string;
 		progress = "<p>Finished processing</p>"
 		downloadable = true;
 	}
 </script>
 
-<Head title={"Hare - Creator Assitant"} description={"Generate a sheet that has links for nation creation that works with the provided userscripts."} />
+<Head title={"Hare - Creator Assistant"} description={"Generate a sheet that has links for nation creation that works with the provided userscripts."} />
 
 <h1 class="text-4xl mb-2">Creator Assistant</h1>
 <p class="text-xs mb-1">
@@ -40,7 +37,7 @@
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
 	<form on:submit|preventDefault={() => login(puppets)} class="flex flex-col gap-8">
-		<InputCredentials bind:main bind:puppets authenticated={false} />
+		<Textarea text="Puppets" bind:bindValue={puppets} forValue="pup" required />
 		<Buttons>
 			<button disabled={!downloadable} on:click={() => handleDownload('html', htmlContent(content), 'Creator')}
 				class="bg-green-500 rounded-md px-4 py-2 transition duration-300 hover:bg-green-300 disabled:opacity-20 disabled:hover:bg-green-500">
diff --git a/src/routes/tools/creation/+server.ts b/src/routes/tools/creation/+server.ts
new file mode 100644
index 0000000..c8cacf0
--- /dev/null
+++ b/src/routes/tools/creation/+server.ts
@@ -0,0 +1 @@
+export const prerender = true;
\ No newline at end of file
diff --git a/src/routes/tools/endotart/+page.svelte b/src/routes/tools/endotart/+page.svelte
index abf203c..802e7e3 100644
--- a/src/routes/tools/endotart/+page.svelte
+++ b/src/routes/tools/endotart/+page.svelte
@@ -2,7 +2,6 @@
 	import { onDestroy, onMount } from 'svelte';
 	import { parseXML, parser, sleep } from '$lib/globals';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Buttons from '$lib/component/Buttons.svelte';
 	import Input from '$lib/component/Input.svelte';
@@ -10,37 +9,52 @@
 	import type { NSNation, Nation, Region } from '$lib/types';
 	import Select from '$lib/component/Select.svelte';
 	const abortController = new AbortController();
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	let progress = "";
-	let main = "";
-	let endotartnation = '';
 	let stopped = false;
 	let stoppable = false;
-	let immune = "";
-	let endotartsource = "XML";
-	let limit: number | undefined = undefined;
-	onMount(() => ({ main, endotartnation, limit, endotartsource } = loadLocalStorage(["stationMain", "stationEndotartNation", "stationEndotartLimit", "stationEndotartSource"])));
+
+	let source: string;
+	let main: string;
+	let endotarter: string;
+	let immune: string;
+	let limit: string;
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		endotarter = data.parameters.endotarter || loadStorage("endotartEndotarter") as string || "";
+		immune = data.parameters.immune ? data.parameters.immune.replaceAll(',', '\n') : loadStorage("endotartImmune") as string || "";
+		limit = data.parameters.limit || loadStorage("endotartLimit") as string || "";
+ 		source = data.parameters.source || loadStorage("endotartSource") as string || "XML";
+	});
 	onDestroy(() => abortController.abort() );
-	async function findWA() {
+	async function endotart() {
+		pushHistory(`?main=${main}${limit ? `&limit=${limit}` : ""}&nation=${endotarter}&source=${source}${immune ? `&immune=${immune}` : ""}`);
 		progress = "";
 		stoppable = true;
 		stopped = false;
 		const whiteList = immune ? immune.split('\n').map(nation => nation.toLowerCase().replace(' ', '_')) : [];
 
-        const regionalXML: Nation = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?nation=${endotartnation}&q=endorsements+region+wa`, main)
+        const regionalXML: Nation = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?nation=${endotarter}&q=endorsements+region+wa`, main)
         if (regionalXML.NATION.UNSTATUS === "Non-member") {
-            progress += `<p class="text-red-400">${endotartnation} is not in the WA.</p>`
+            progress += `<p class="text-red-400">${endotarter} is not in the WA.</p>`
 			return;
         }
         await sleep(700)
 
-        progress += `<p>Searching for the nations in ${regionalXML.NATION.REGION} not being endorsed by ${endotartnation}, using the ${endotartsource}</p>`
-        const wamems: Region = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?region=${regionalXML.NATION.REGION}&q=wanations`, main)
+        progress += `<p>Searching for the nations in ${regionalXML.NATION.REGION} not being endorsed by ${endotarter}, using the ${source}</p>`
+		if (whiteList.length > 0) {
+			progress += `<p>Nations immune to endocap: ${whiteList.map((region) => region.trim()).join(', ')}</p>`;
+		}
+		const wamems: Region = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?region=${regionalXML.NATION.REGION}&q=wanations`, main)
         const regionalWA = wamems.REGION.UNNATIONS.split(',')
 		let xml;
 		let NAME;
 		let ENDORSEMENTS;
 
-		if (endotartsource === "XML") {
+		if (source === "XML") {
 			const currentDate = new Date();
 			const utcMinus7Date = new Date(currentDate.getTime() - 7 * 60 * 60 * 1000);
 			utcMinus7Date.setDate(utcMinus7Date.getDate() - 1);
@@ -50,12 +64,13 @@
 				method: "GET"
 			});
 			if (nationRes.status === 404) {
-				progress += `<p>Could not find ${date} national dump, defaulting to the API.</p>`
-				endotartsource = "API";
+				progress += `<p class="text-yellow-400">Could not find ${date} national dump, defaulting to the API.</p>`
+				source = "API";
 			} else {
+				progress += `<p class="text-green-400">Found ${date} national dump.</p>`
+				progress += `<p>Parsing dump for endotarting...</p>`
 				const regionText = await nationRes.text()
 				xml = parser.parse(regionText)
-				progress += `<p>Found ${date} national dump.</p>`
 			}
 		}
 
@@ -64,44 +79,38 @@
 				break;
 			}
 
-			if (endotartsource === "API") {
+			if (source === "API") {
 				await sleep(700);
 				xml = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?nation=${regionalWA[i]}&q=endorsements+name`, main) as Nation
 				NAME = String(xml.NATION.NAME);
 				ENDORSEMENTS = String(xml.NATION.ENDORSEMENTS).includes(',') ? xml.NATION.ENDORSEMENTS.split(',') : [xml.NATION.ENDORSEMENTS];
 				await sleep(700);
 			} else {
-				const nations = (xml.NATIONS.NATION as Array<NSNation>).filter(nation => String(nation.NAME).toLowerCase().replace(/ /g, '_') === (regionalWA[i].toLowerCase()));
-				if (nations.length > 0) {
-					({ NAME, ENDORSEMENTS } = nations[0])
-				} else {
-					progress += `<p class="text-yellow-400">${i+1}/${regionalWA.length} ${regionalWA[i]} not found, likely not in the dump yet`
-				}
+				const nations = (xml.NATIONS.NATION as Array<NSNation>).filter(nation => String(nation.NAME).toLowerCase().replace(/ /g, '_') === (regionalWA[i].toLowerCase()))[0];
+				({ NAME, ENDORSEMENTS } = nations)
 			}
 
-			if (NAME && ENDORSEMENTS) {
-				if (endotartnation.toLowerCase().replaceAll(' ', '_') === String(NAME).toLowerCase().replaceAll(' ', '_')) {
-					progress += `<p class="text-yellow-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is the endotart nation.</p>`
-				} else if (limit) {
-					if (whiteList.includes(regionalWA[i])) {
-						progress += `<p class="text-yellow-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is in your immune nations.</p>`
-					} else if (ENDORSEMENTS.length < limit && !ENDORSEMENTS.includes(endotartnation.toLowerCase().replaceAll(' ', '_')) && regionalWA[i] !== endotartnation.toLowerCase().replaceAll(' ', '_')) {
-						progress += `<p class="text-green-400">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is not being endorsed by ${endotartnation}.</p>`
-					} else if (ENDORSEMENTS.length > limit) {
-						progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> has more than ${limit} endorsements.</p>`
-					} else {
-						progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is already endorsed by ${endotartnation}.</p>`
-					}
+			if (endotartnation.toLowerCase().replaceAll(' ', '_') === String(NAME).toLowerCase().replaceAll(' ', '_')) {
+				progress += `<p class="text-yellow-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is the endotart nation.</p>`
+			} else if (limit) {
+				if (whiteList.includes(regionalWA[i])) {
+					progress += `<p class="text-yellow-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is in your immune nations.</p>`
+				} else if (ENDORSEMENTS.length < limit && !ENDORSEMENTS.includes(endotartnation.toLowerCase().replaceAll(' ', '_')) && regionalWA[i] !== endotartnation.toLowerCase().replaceAll(' ', '_')) {
+					progress += `<p class="text-green-400">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is not being endorsed by ${endotartnation}.</p>`
+				} else if (ENDORSEMENTS.length > limit) {
+					progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> has more than ${limit} endorsements.</p>`
+				} else {
+					progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is already endorsed by ${endotartnation}.</p>`
+				}
+			} else {
+				if (!ENDORSEMENTS.includes(endotartnation.toLowerCase().replaceAll(' ', '_')) && regionalWA[i] !== endotartnation.toLowerCase().replaceAll(' ', '_')) {
+					progress += `<p class="text-green-400">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is not being endorsed by ${endotartnation}.</p>`
 				} else {
-					if (!ENDORSEMENTS.includes(endotartnation.toLowerCase().replaceAll(' ', '_')) && regionalWA[i] !== endotartnation.toLowerCase().replaceAll(' ', '_')) {
-						progress += `<p class="text-green-400">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is not being endorsed by ${endotartnation}.</p>`
-					} else {
-						progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is already endorsed by ${endotartnation}.</p>`
-					}
+					progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is already endorsed by ${endotartnation}.</p>`
 				}
 			}
         }
-		progress += `<p>Finished searching ${regionalXML.NATION.REGION} for nations not being endorsed by ${endotartnation}</p>`
+		progress += `<p>Finished searching ${regionalXML.NATION.REGION} for nations not being endorsed by ${endotarter}</p>`
 		stoppable = false;
 	}
 </script>
@@ -114,13 +123,13 @@
 <p class="mb-16">Specify a nation and get all the regionmates they are not endorsing.</p>
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
-	<form on:submit|preventDefault={findWA} class="flex flex-col gap-8">
-		<Input text="User Agent" bind:bindValue={main} forValue="main" required={true} />
-		<Input text="Endotart Nation" bind:bindValue={endotartnation} forValue="endotartnation" required={true} />
+	<form on:submit|preventDefault={endotart} class="flex flex-col gap-8">
+		<Input text="User main" bind:bindValue={main} forValue="main" required={true} />
+		<Input text="Endotart Nation" bind:bindValue={endotarter} forValue="endotarter" required={true} />
 		<Input text="Endorse Limit" bind:bindValue={limit} forValue="limit" required={false} />
 		<div class="flex gap-4 justify-between max-w-lg">
 			<label class="w-24" for="mode">Source</label>
-            <Select bind:mode={endotartsource} options={["XML", "API"]} />
+            <Select bind:mode={source} options={["XML", "API"]} />
 		</div>
 		<Textarea text="Immune Nations" bind:bindValue={immune} forValue="immune" />
 		<Buttons>
@@ -138,4 +147,4 @@
 		</Buttons>
 	</form>
 	<Terminal bind:progress={progress} />
-</div>
+</div>
\ No newline at end of file
diff --git a/src/routes/tools/endotart/wellspring/+page.svelte b/src/routes/tools/endotart/wellspring/+page.svelte
deleted file mode 100644
index 37aab50..0000000
--- a/src/routes/tools/endotart/wellspring/+page.svelte
+++ /dev/null
@@ -1,146 +0,0 @@
-<script lang="ts">
-	import { page } from '$app/stores';
-	import { onDestroy, onMount } from 'svelte';
-	import { parseXML, parser, sleep } from '$lib/globals';
-	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
-	import Terminal from '$lib/component/Terminal.svelte';
-	import Buttons from '$lib/component/Buttons.svelte';
-	import Input from '$lib/component/Input.svelte';
-	import Textarea from '$lib/component/Textarea.svelte';
-	import type { NSNation, Nation, Region } from '$lib/types';
-	import Select from '$lib/component/Select.svelte';
-	const abortController = new AbortController();
-	let progress = "";
-	let main = "";
-	let endotartnation = '';
-	let stopped = false;
-	let stoppable = false;
-	let immune =  "";
-	let endotartsource = "XML";
-	let limit: number | undefined = undefined;
-	onMount(() => {
-		({ main, endotartnation, limit } = loadLocalStorage(["stationMain", "stationEndotartNation", "stationEndotartLimit"]))
-        if (!limit) limit = 15;
-        if (!immune) immune = "9006\nTurpotia\nUSS Merrimack\nWell-Sprung Jack\nYasou\nEvil Mother"
-	});
-	onDestroy(() => abortController.abort() );
-	async function findWA() {
-		progress = "";
-		stoppable = true;
-		stopped = false;
-		const whiteList = immune ? immune.split('\n').map(nation => nation.toLowerCase().replace(' ', '_')) : [];
-
-        const regionalXML: Nation = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?nation=${endotartnation}&q=endorsements+region+wa`, main)
-        if (regionalXML.NATION.UNSTATUS === "Non-member") {
-            progress += `<p class="text-red-400">${endotartnation} is not in the WA.</p>`
-			return;
-        }
-        await sleep(700)
-
-        progress += `<p>Searching for the nations in ${regionalXML.NATION.REGION} not being endorsed by ${endotartnation}, using the ${endotartsource}</p>`
-        const wamems: Region = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?region=${regionalXML.NATION.REGION}&q=wanations`, main)
-        const regionalWA = wamems.REGION.UNNATIONS.split(',')
-		let xml;
-		let NAME;
-		let ENDORSEMENTS;
-
-		if (endotartsource === "XML") {
-			const currentDate = new Date();
-			const utcMinus7Date = new Date(currentDate.getTime() - 7 * 60 * 60 * 1000);
-			utcMinus7Date.setDate(utcMinus7Date.getDate() - 1);
-			const date = utcMinus7Date.toISOString().slice(0, 10);
-			progress += `<p>Requesting ${date} national dump.</p>`
-			const nationRes = await fetch(`https://raw.githubusercontent.com/Kractero/region-dump-xml/main/data/${date}-Nations.xml`, {
-				method: "GET"
-			});
-			if (nationRes.status === 404) {
-				progress += `<p>Could not find ${date} national dump, defaulting to the API.</p>`
-				endotartsource = "API";
-			} else {
-				const regionText = await nationRes.text()
-				xml = parser.parse(regionText)
-				progress += `<p>Found ${date} national dump.</p>`
-			}
-		}
-
-        for (let i = 0; i < regionalWA.length; i++) {
-			if (abortController.signal.aborted || stopped) {
-				break;
-			}
-
-			if (endotartsource === "API") {
-				await sleep(700);
-				xml = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?nation=${regionalWA[i]}&q=endorsements+name`, main) as Nation
-				NAME = String(xml.NATION.NAME);
-				ENDORSEMENTS = String(xml.NATION.ENDORSEMENTS).includes(',') ? xml.NATION.ENDORSEMENTS.split(',') : [xml.NATION.ENDORSEMENTS];
-				await sleep(700);
-			} else {
-				const nations = (xml.NATIONS.NATION as Array<NSNation>).filter(nation => String(nation.NAME).toLowerCase().replace(/ /g, '_') === (regionalWA[i].toLowerCase()));
-				if (nations.length > 0) {
-					({ NAME, ENDORSEMENTS } = nations[0])
-				} else {
-					progress += `<p class="text-yellow-400">${i+1}/${regionalWA.length} ${regionalWA[i]} not found, likely not in the dump yet`
-				}
-			}
-
-			if (NAME && ENDORSEMENTS) {
-				if (endotartnation.toLowerCase().replaceAll(' ', '_') === String(NAME).toLowerCase().replaceAll(' ', '_')) {
-					progress += `<p class="text-yellow-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is the endotart nation.</p>`
-				} else if (limit) {
-					if (whiteList.includes(regionalWA[i])) {
-						progress += `<p class="text-yellow-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is in your immune nations.</p>`
-					} else if (ENDORSEMENTS.length < limit && !ENDORSEMENTS.includes(endotartnation.toLowerCase().replaceAll(' ', '_')) && regionalWA[i] !== endotartnation.toLowerCase().replaceAll(' ', '_')) {
-						progress += `<p class="text-green-400">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is not being endorsed by ${endotartnation}.</p>`
-					} else if (ENDORSEMENTS.length > limit) {
-						progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> has more than ${limit} endorsements.</p>`
-					} else {
-						progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is already endorsed by ${endotartnation}.</p>`
-					}
-				} else {
-					if (!ENDORSEMENTS.includes(endotartnation.toLowerCase().replaceAll(' ', '_')) && regionalWA[i] !== endotartnation.toLowerCase().replaceAll(' ', '_')) {
-						progress += `<p class="text-green-400">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is not being endorsed by ${endotartnation}.</p>`
-					} else {
-						progress += `<p class="text-red-400 font-extralight">${i+1}/${regionalWA.length} <a class="underline" href="https://nationstates.net/nation=${regionalWA[i]}"}>${regionalWA[i]}</a> is already endorsed by ${endotartnation}.</p>`
-					}
-				}
-			}
-        }
-		progress += `<p>Finished searching ${regionalXML.NATION.REGION} for nations not being endorsed by ${endotartnation}</p>`
-		stoppable = false;
-	}
-</script>
-
-<Head title={"Hare - Endotarting"} description={"Specify a nation and get all the regionmates they are not endorsing."} />
-
-<h1 class="text-4xl mb-2">Endotarting</h1>
-<p class="text-xs mb-4">
-	A <a href="https://github.com/nsupc/UPC-3PO" target="_blank" rel="noreferrer noopener">UPC-3PO</a> command rewritten in JavaScript by Kractero
-<p class="mb-16">Specify a nation and get all the regionmates they are not endorsing.</p>
-
-<div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
-	<form on:submit|preventDefault={findWA} class="flex flex-col gap-8">
-		<Input text="User Agent" bind:bindValue={main} forValue="main" required={true} />
-		<Input text="Endotart Nation" bind:bindValue={endotartnation} forValue="endotartnation" required={true} />
-		<Input text="Endorse Limit" bind:bindValue={limit} forValue="limit" required={false} />
-		<div class="flex gap-4 justify-between max-w-lg">
-			<label class="w-24" for="mode">Source</label>
-            <Select bind:mode={endotartsource} options={["XML", "API"]} />
-		</div>
-		<Textarea text="Immune Nations" bind:bindValue={immune} forValue="immune" />
-		<Buttons>
-			<button
-				type="button"
-				disabled={!stoppable}
-				on:click={() => { {
-					stoppable = false;
-					stopped = true;
-				} }}
-				class="bg-red-500 rounded-md px-4 py-2 transition duration-300 hover:bg-red-300 disabled:opacity-20 disabled:hover:bg-red-500"
-			>
-				Stop
-			</button>
-		</Buttons>
-	</form>
-	<Terminal bind:progress={progress} />
-</div>
diff --git a/src/routes/tools/finder/+page.svelte b/src/routes/tools/finder/+page.svelte
index 1bf1fb5..25668a9 100644
--- a/src/routes/tools/finder/+page.svelte
+++ b/src/routes/tools/finder/+page.svelte
@@ -6,29 +6,40 @@
 	import InputCredentials from '$lib/component/InputCredentials.svelte';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Input from '$lib/component/Input.svelte';
 	import Select from '$lib/component/Select.svelte';
 	import Textarea from '$lib/component/Textarea.svelte';
 	import type { Card } from '$lib/types';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	const abortController = new AbortController();
 	let progress = "";
-	let main = '';
-	let puppets = '';
-	let finderlist = '';
-	let finderMode = 'Gift';
 	let openNewLinkArr: Array<string> = [];
 	let counter = 0;
 	let junkHtml = '';
     let downloadable = false;
 	let stoppable = false;
 	let stopped = false;
+
+	let main = '';
+	let puppets = '';
+	let finderlist = '';
+	let mode = 'Gift';
 	let password = "";
 	let giftee = "";
-	onMount(() => ({puppets, main, finderlist, finderMode, password, giftee} = loadLocalStorage(["stationPuppets", "stationMain", "stationFinderList", "stationFinderDefault", "stationPassword", "stationGiftee"])));
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		puppets = loadStorage("puppets") as string || "";
+		finderlist = loadStorage("finderList") as string || "";
+		mode = data.parameters.mode || loadStorage("finderMode") as string || "Gift";
+		giftee = data.parameters.giftee || loadStorage("finderGiftee") as string || "";
+	});
 	onDestroy(() => abortController.abort());
 
 	async function finder(main: string, puppets: string) {
+		pushHistory(`?main=${main}&mode=${mode}${giftee ? `&giftee=${giftee}`: ""}`)
 		downloadable = false;
 		stoppable = true;
 		stopped = false;
@@ -56,52 +67,58 @@
 				const xml = await response.text();
 				const xmlDocument = parser.parse(xml);
 				const cards: Array<Card> = xmlDocument.CARDS.DECK.CARD;
-                const matches = finderlist.split('\n')
+                const matches = finderlist.split('\n').map(matcher => matcher.split(','))
 				if (cards) {
 					for (let j = 0; j < cards.length; j++) {
 						const id = cards[j].CARDID;
 						const season = cards[j].SEASON
-						if (matches.includes(String(id))) {
-							progress += `<p class="text-green-400">Found S${season} ${id} on ${puppetsList[i]}</p>`;
-							if (finderMode === "Gift") {
-								let token = ""
-								const prepare = await fetch(
-									`https://www.nationstates.net/cgi-bin/api.cgi/?nation=${nation}&cardid=${id}&season=${season}&to=${giftee}&mode=prepare&c=giftcard`,
-									{
-										headers: {
-											'User-Agent': main,
-											'X-Password': currentNationXPin ? currentNationXPin : password
+						const matchingIndex = matches.findIndex(match => match[0] === String(id));
+						if (matchingIndex !== -1) {
+							const matchSeason = matches[matchingIndex][1];
+							if (matchSeason && matchSeason !== String(season)) {
+								progress += `<p>Found ${id} but not right season.`
+							} else {
+								progress += `<p class="text-green-400">Found S${season} ${id} on ${puppetsList[i]}</p>`;
+								if (mode === "Gift") {
+									let token = ""
+									const prepare = await fetch(
+										`https://www.nationstates.net/cgi-bin/api.cgi/?nation=${nation}&cardid=${id}&season=${season}&to=${giftee}&mode=prepare&c=giftcard`,
+										{
+											headers: {
+												'User-Agent': main,
+												'X-Password': currentNationXPin ? currentNationXPin : password
+											}
 										}
-									}
-								);
-								if (!currentNationXPin) currentNationXPin = prepare.headers.get('x-pin') || "";
-								const text = await prepare.text()
-								const xml = parser.parse(text)
-								token = xml.NATION.SUCCESS
-								
-								const gift = await fetch(
-									`https://www.nationstates.net/cgi-bin/api.cgi/?nation=${nation}&cardid=${id}&season=${season}&to=${giftee}&mode=execute&c=giftcard&token=${token}`,
-									{
-										headers: {
-											'User-Agent': main,
-											'X-Pin': currentNationXPin
+									);
+									if (!currentNationXPin) currentNationXPin = prepare.headers.get('x-pin') || "";
+									const text = await prepare.text()
+									const xml = parser.parse(text)
+									token = xml.NATION.SUCCESS
+									
+									const gift = await fetch(
+										`https://www.nationstates.net/cgi-bin/api.cgi/?nation=${nation}&cardid=${id}&season=${season}&to=${giftee}&mode=execute&c=giftcard&token=${token}`,
+										{
+											headers: {
+												'User-Agent': main,
+												'X-Pin': currentNationXPin
+											}
 										}
+									);
+									if (gift.status === 200) {
+										progress += `<p class="text-green-400">${nation} gifted ${id} to ${giftee}`;
+									} else {
+										progress += `<p class="text-red-400">${nation} failed to gift ${id} to ${giftee}`;
 									}
-								);
-								if (gift.status === 200) {
-									progress += `<p class="text-green-400">${nation} gifted ${id} to ${giftee}`;
 								} else {
-									progress += `<p class="text-red-400">${nation} failed to gift ${id} to ${giftee}`;
+									progress += `<p class="text-green-400">${nation} owns ${id}!`;
+									openNewLinkArr = [
+										...openNewLinkArr,
+										`https://www.nationstates.net/page=deck/container=${nation}/nation=${nation}/card=${id}/season=${season}/User_agent=${main}Script=Finder/Author_discord=scrambleds/Author_main_nation=Kractero/autoclose=1`
+									];
+									junkHtml += `<tr><td><p>${i + 1} of ${
+										cards.length
+									}</p></td><td><p><a target="_blank" href="https://www.nationstates.net/page=deck/container=${nation}/nation=${nation}/card=${id}/season=${season}/User_agent=${main}Script=Finder/Author_discord=scrambleds/Author_main_nation=Kractero/autoclose=1\n">Link to Card</a></p></td></tr>\n`;
 								}
-							} else {
-								progress += `<p class="text-green-400">${nation} owns ${id}!`;
-								openNewLinkArr = [
-									...openNewLinkArr,
-									`https://www.nationstates.net/page=deck/container=${nation}/nation=${nation}/card=${id}/season=${season}/User_agent=${main}Script=Finder/Author_discord=scrambleds/Author_main_nation=Kractero/autoclose=1`
-								];
-								junkHtml += `<tr><td><p>${i + 1} of ${
-									cards.length
-								}</p></td><td><p><a target="_blank" href="https://www.nationstates.net/page=deck/container=${nation}/nation=${nation}/card=${id}/season=${season}/User_agent=${main}Script=Finder/Author_discord=scrambleds/Author_main_nation=Kractero/autoclose=1\n">Link to Card</a></p></td></tr>\n`;
 							}
 						}
 					}
@@ -125,20 +142,28 @@
 	<a class="underline" href="https://github.com/Kractero/cards-utilities/blob/main/finder.py" target="_blank" rel="noreferrer noopener">
 		Kractero
 	</a>
-<p class="mb-16">
+<p class="mb-1">
 	Find which of the specified nations have which of the specified cards.
 </p>
+<p class={`text-xs ${mode === "Gift" ? "mb-1" : "mb-16"}`}>
+	You can additionally specify season by entering into the find list CARDID,SEASON instead of just CARDID on each line.
+</p>
+{#if mode === "Gift"}
+	<p class="text-xs mb-16">
+		Password input is optional and will be disabled if the puppet list includes a comma for nation,password.
+	</p>
+{/if}
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
 	<form on:submit|preventDefault={() => finder(main, puppets)} class="flex flex-col gap-8">
-		<InputCredentials bind:main bind:puppets authenticated={finderMode === "Gift" ? true : false} />
-		{#if finderMode === "Gift"}
+		<InputCredentials bind:main bind:puppets authenticated={mode === "Gift" ? true : false} />
+		{#if mode === "Gift"}
 			<Input text={`Gift To`} bind:bindValue={giftee} forValue="giftee" required={true} />
 		{/if}
 		<Textarea text="Card IDs to Find" bind:bindValue={finderlist} forValue="find" required />
-        <div class="flex flex-col lg:flex-row gap-4 justify-between max-w-lg">
+        <div class="flex gap-4 justify-between max-w-lg">
             <label class="w-24" for="jdj">Finder Default Behavior</label>
-			<Select bind:mode={finderMode} options={['Gift', 'Sell']} />
+			<Select bind:mode={mode} options={['Gift', 'Sell']} />
         </div>
 		<div class="max-w-lg flex justify-center gap-2">
 			<button
diff --git a/src/routes/tools/goldretriever/+page.svelte b/src/routes/tools/goldretriever/+page.svelte
index 6961acb..1d0d3ce 100644
--- a/src/routes/tools/goldretriever/+page.svelte
+++ b/src/routes/tools/goldretriever/+page.svelte
@@ -3,29 +3,40 @@
 	import { htmlContent } from '$lib/htmlContent';
 	import { onDestroy, onMount } from 'svelte';
 	import InputCredentials from '$lib/component/InputCredentials.svelte';
-	import { parser, sleep } from '$lib/globals';
+	import { parseXML, sleep } from '$lib/globals';
 	import { sort } from '$lib/sortFunctionString';
 	import { style } from '$lib/sortFunctionString';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Head from '$lib/component/Head.svelte';
 	import Buttons from '$lib/component/Buttons.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
-	import type { Card } from '$lib/types';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
+	import type { Card, Issue } from '$lib/types';
+	import Select from '$lib/component/Select.svelte';
 	const abortController = new AbortController();
 	let progress = "";
-	let main = '';
-	let puppets = '';
-	let password = '';
 	let downloadable = false;
 	let content = `<tr><th>Nation</th><th class='sort' data-order='none'>Bank</th><th class='sort' data-order='none'>Deck Value</th><th class='sort' data-order='none'>Junk Value</th><th class='sort' data-order='none'>Card Count</th></tr>\n`;
 	let stoppable = false;
 	let stopped = false;
-
-	onMount(() => ({puppets, main} = loadLocalStorage(["stationPuppets", "stationMain"])));
+	let main = '';
+	let puppets = '';
+	let password = '';
+	let mode: string;
+	
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		puppets = loadStorage("puppets") as string || "";
+		password = loadStorage("password") as string || "";
+		mode = data.parameters.mode || loadStorage("goldretrieverMode") as string || "Include";
+	});
 
 	onDestroy(() => abortController.abort());
 
-	async function goldRetriever(main: string, puppets: string, password?: string) {
+	async function goldRetriever() {
+		pushHistory(`?main=${main}&mode=${mode}`)
 		downloadable = false;
 		stoppable = true;
 		stopped = false;
@@ -34,11 +45,13 @@
 			bank: 0,
 			deckValue: 0,
 			junkValue: 0,
-			cardCount: 0
+			cardCount: 0,
+			issues: 0,
+			packs: 0
 		}
 		for (let i = 0; i < puppetList.length; i++) {
 			let nation = puppetList[i];
-			if (!password) {
+			if (mode === "Include" && !password) {
 				nation = puppetList[i].split(',')[0];
 				password = puppetList[i].split(',')[1];
 			}
@@ -49,31 +62,20 @@
 			try {
 				await sleep(700);
 				progress += `<p>Processing ${nation} ${i + 1}/${puppetList.length}</p>`;
-				const response = await fetch(
-					'https://www.nationstates.net/cgi-bin/api.cgi/?nationname=' +
-						nation +
-						'&q=cards+deck+info',
-					{
-						method: 'GET',
-						headers: {
-							'User-Agent': main
-							// "X-Password": password ? password.replace(" ", "_") : "",
-						}
-					}
-				);
-				const xml = await response.text();
-				const xmlObj = parser.parse(xml);
+				const deckInfo = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi/?nationname=${nation}&q=cards+deck+info`, main)
 				const deck = {
 					nation: nation,
 					bank: 0,
 					deckValue: 0,
 					junkValue: 0,
-					cardCount: 0
+					cardCount: 0,
+					issues: 0,
+					packs: 0
 				};
 
 				const categoryCounts: { [key: string]: number } = {};
-				if (xmlObj.CARDS.DECK.CARD) {
-					const deckObj: Array<Card> = xmlObj.CARDS.DECK.CARD;
+				if (deckInfo.CARDS.DECK.CARD) {
+					const deckObj: Array<Card> = deckInfo.CARDS.DECK.CARD;
 					for (let i = 0; i < deckObj.length; i++) {
 						const category = deckObj[i].CATEGORY;
 						if (categoryCounts[category]) {
@@ -89,20 +91,38 @@
 						(categoryCounts.uncommon || 0) * 0.05 +
 						(categoryCounts['ultra-rare'] || 0) * 0.2).toFixed(2));
 
-					deck.bank = xmlObj.CARDS.INFO.BANK;
-					deck.deckValue = xmlObj.CARDS.INFO.DECK_VALUE;
-					deck.cardCount = xmlObj.CARDS.INFO.NUM_CARDS;
+					deck.bank = deckInfo.CARDS.INFO.BANK;
+					deck.deckValue = deckInfo.CARDS.INFO.DECK_VALUE;
+					deck.cardCount = deckInfo.CARDS.INFO.NUM_CARDS;
+				}
+				console.log(mode)
+				if (mode === "Include") {
+					await sleep(700);
+					const issuesAndPacks = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi/?nation=${nation}&q=issues+packs`, main, password.replaceAll(' ', '_'));
+					const packs = issuesAndPacks.NATION.PACKS;
+					const issues: Issue = issuesAndPacks.NATION.ISSUES.ISSUE || []
+					if (issues && !Array.isArray(issues)) {
+						deck.issues = 1;
+					} else {
+						deck.issues = issues.length
+					}
+					deck.packs = packs;
 				}
+
+				console.log(deck)
+
 				totals.bank = totals.bank + deck.bank
 				totals.deckValue = totals.deckValue + deck.deckValue
 				totals.junkValue = totals.junkValue + deck.junkValue
 				totals.cardCount = totals.cardCount + deck.cardCount
+				totals.issues = totals.issues + deck.issues;
+				totals.packs = totals.packs + deck.packs;
 				content += `<tr><td><a target='_blank' href='https://www.nationstates.net/container=${nation_formatted}/nation=${nation_formatted}'>${deck.nation}</a></td><td><a target='_blank' href='https://www.nationstates.net/page=deck/container=${nation_formatted}/nation=${nation_formatted}/value_deck=1'>${deck.bank}</a></td><td><a target='_blank' href='https://www.nationstates.net/page=deck/container=${nation_formatted}/nation=${nation_formatted}/value_deck=1'>${deck.deckValue}</a></td><td><a target='_blank' href='https://www.nationstates.net/page=deck/container=${nation_formatted}/nation={container_url}'>${deck.junkValue}</a></td><td><a target='_blank' href='https://www.nationstates.net/container=${nation_formatted}/nation=${nation_formatted}'>${deck.cardCount}</a></td></tr>\n`;
 			} catch (err) {
 				progress += `<p class="text-red-400">Error processing ${nation} with ${err}</p>`;
 			}
 		}
-		progress += `<p>Finished processing! You have a cumulative ${totals.bank.toFixed(2)} bank, ${totals.deckValue.toFixed(2)} deckValue, ${totals.junkValue.toFixed(2)} junk value, and ${totals.cardCount} cards.</p>`;
+		progress += `<p>Finished processing! You have a cumulative ${totals.bank.toFixed(2)} bank, ${totals.deckValue.toFixed(2)} deckValue, ${totals.junkValue.toFixed(2)} junk value, and ${totals.cardCount} cards. ${mode === "Include" ? `${totals.issues} issues await you, and you have ${totals.packs} packs to open.` : ""}</p>`;
 		downloadable = true;
 		stoppable = false;
 	}
@@ -124,10 +144,14 @@
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
 	<form
-		on:submit|preventDefault={() => goldRetriever(main, puppets, password)}
+		on:submit|preventDefault={() => goldRetriever()}
 		class="flex flex-col gap-8"
 	>
-		<InputCredentials bind:main bind:puppets bind:password authenticated={false} />
+		<InputCredentials bind:main bind:puppets bind:password authenticated={mode === "Include" ? true : false}/>
+		<div class="flex gap-4 justify-between max-w-lg">
+            <label class="w-24" for="jdj">Issues and Packs?</label>
+			<Select bind:mode={mode} options={['Include', 'Skip']} />
+        </div>
 		<Buttons>
 			<button
 				type="button"
diff --git a/src/routes/tools/gotissues/+page.svelte b/src/routes/tools/gotissues/+page.svelte
index c071b00..b514123 100644
--- a/src/routes/tools/gotissues/+page.svelte
+++ b/src/routes/tools/gotissues/+page.svelte
@@ -6,32 +6,41 @@
 	import { parseXML, sleep } from '$lib/globals';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Buttons from '$lib/component/Buttons.svelte';
 	import type { Issue } from '$lib/types';
 	import Select from '$lib/component/Select.svelte';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	const abortController = new AbortController();
 	let progress = "";
-	let main = '';
-	let puppets = '';
-	let password = '';
 	let openNewLinkArr: Array<string> = [];
 	let counter = 0;
 	let downloadable = false;
 	let issuesContent = '';
 	let stoppable = false;
 	let stopped = false;
-	let issuesmode =  "";
 
-	onMount(() => ({puppets, main, password, issuesmode} = loadLocalStorage(["stationPuppets", "stationMain", "stationPassword", "stationIssuesMode"])));
+	let main = '';
+	let puppets = '';
+	let password = '';
+	let mode =  '';
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		puppets = loadStorage("gotissuesPuppets") as string || "";
+		password = loadStorage("password") as string || "";
+		mode = data.parameters.mode || loadStorage("gotissuesMode") as string || "";
+	});
 	onDestroy(() => abortController.abort());
 
-	async function gotIssues(main: string, puppets: string, password?: string) {
+	async function gotIssues() {
+		pushHistory(`?main=${main}&mode=${mode}`)
 		downloadable = false;
 		stoppable = true;
 		stopped = false;
 		progress = "";
-		progress += `<p class="font-bold">Initiating gotIssues...mode set to ${issuesmode}</p>`;
+		progress += `<p class="font-bold">Initiating gotIssues...mode set to ${mode}</p>`;
 		openNewLinkArr = [];
 		issuesContent = "";
 		let puppetList = puppets.split('\n');
@@ -53,7 +62,7 @@
 				await sleep(700);
 				progress += `<p>Processing ${nation} ${i + 1}/${puppetList.length}</p>`;
 				const xmlObj = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi/?nation=${nation}&q=issues+packs`, main, password?.replaceAll(' ', '_'));
-				if (issuesmode === "Both" || issuesmode === "Issues") {
+				if (mode === "Both" || mode === "Issues") {
 					const issues: Issue = xmlObj.NATION.ISSUES.ISSUE || []
 					let issueIds: Array<string> = []
 					if (!Array.isArray(issues)) issueIds.push(issues['@_id'])
@@ -69,11 +78,11 @@
 						issuesCount++;
 					});
 				}
-				if (issuesmode === "Both" || issuesmode === "Packs") {
+				if (mode === "Both" || mode === "Packs") {
 					const packs = xmlObj.NATION.PACKS;
 					if (packs) {
 						for (let i = 0; i < packs; i++) {
-							if (issuesmode === "Packs") {
+							if (mode === "Packs") {
 								openNewLinkArr = [
 									...openNewLinkArr,
 									`https://www.nationstates.net/page=deck/nation=${nation_formatted}/container=${nation_formatted}/?open_loot_box=1/template-overall=none//User_agent=${main}/Script=Gotissues/Author_discord=scrambleds/Author_main_nation=Kractero/autoclose=1`
@@ -127,13 +136,13 @@
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
 	<form
-		on:submit|preventDefault={() => gotIssues(main, puppets, password)}
+		on:submit|preventDefault={() => gotIssues()}
 		class="flex flex-col gap-8"
 	>
 		<InputCredentials bind:main bind:puppets bind:password authenticated={true} />
         <div class="flex gap-4 justify-between max-w-lg">
 			<label class="w-24" for="mode">Mode</label>
-            <Select bind:mode={issuesmode} options={["Both", "Issues", "Packs"]} />
+            <Select bind:mode={mode} options={["Both", "Issues", "Packs"]} />
 		</div>
 		<Buttons>
 			<button
@@ -168,4 +177,4 @@
 		</Buttons>
 	</form>
 	<Terminal bind:progress={progress} />
-</div>
+</div>
\ No newline at end of file
diff --git a/src/routes/tools/junkdajunk/+page.svelte b/src/routes/tools/junkdajunk/+page.svelte
index 8b80c59..054d8f7 100644
--- a/src/routes/tools/junkdajunk/+page.svelte
+++ b/src/routes/tools/junkdajunk/+page.svelte
@@ -7,45 +7,53 @@
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Head from '$lib/component/Head.svelte';
 	import Rarities from '$lib/component/Rarities.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Input from '$lib/component/Input.svelte';
 	import Buttons from '$lib/component/Buttons.svelte';
 	const abortController = new AbortController();
 	import type { Card } from '$lib/types';
 	import Select from '$lib/component/Select.svelte';
 	import Textarea from '$lib/component/Textarea.svelte';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	let progress: "";
-	let main = '';
-	let giftee = '';
-	let puppets = '';
-	let regionalwhitelist = '';
-	let jdjMode = 'Gift';
-	let password = '';
-	let ownercount = '';
 	let openNewLinkArr: Array<string> = [];
 	let counter = 0;
 	let junkHtml = '';
 	let stoppable = false;
 	let stopped = false;
 	let downloadable = false;
+	let main = '';
+	let giftee = '';
+	let puppets = '';
+	let regionalwhitelist = '';
+	let mode = 'Gift';
+	let password = '';
+	let owners = '';
 	let cardcount = '';
-	let rarities: { [key: string]: number } = {
-		common: 0.5,
-		uncommon: 1,
-		rare: 1,
-		'ultra-rare': 1,
-		epic: 1
-	};
-	onMount(() => (
-		{puppets, main, password, giftee, regionalwhitelist, jdjMode, rarities, ownercount, cardcount} = 
-			loadLocalStorage(
-				["stationPuppets", "stationMain", "stationPassword",  "stationGiftee", 
-					"stationRegionalWhitelist", "stationJDJDefault", "stationJDJ", "stationOwnerCount", "stationCardCount"
-				]))
-	)
+	let rarities: {[key: string]: number};
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		puppets = loadStorage("gotissuesPuppets") as string || "";
+		password = loadStorage("gotissuesPuppets") as string || "";
+		mode = data.parameters.mode || loadStorage("junkdajunkMode") as string || "Gift";
+		regionalwhitelist = data.parameters.regions || loadStorage("junkdajunkRegionalWhitelist") as string || "";
+		giftee = data.parameters.giftee || loadStorage("finderGiftee") as string || "";
+		rarities = loadStorage("junkdajunkRarities") as {} || {
+			common: 0.5,
+			uncommon: 1,
+			rare: 1,
+			'ultra-rare': 1,
+			epic: 1
+		}
+		owners = data.parameters.owners || loadStorage("finderOwnerCount") as string || "";
+		cardcount = data.parameters.cardcount || loadStorage("finderCardCount") as string || "";
+	});
 	onDestroy(() => abortController.abort());
 
 	async function junkDaJunk(main: string, puppets: string) {
+		pushHistory(`?main=${main}&mode=${mode}${owners ? `owners=${owners}` : ""}${cardcount ? `cardcount=${cardcount}` : ""}${regionalwhitelist ? `regions=${regionalwhitelist}` : ""}`)
 		downloadable = false;
 		stoppable = true;
 		stopped = false;
@@ -109,11 +117,10 @@
 						let junk = true;
 						let reason = ""
 
-						if (ownercount && Number(ownercount) < owners.size) {
+						if (owners && Number(owners) < owners.size) {
 							junk = false;
-							reason = `, has less owners than ${ownercount}`
+							reason = `, has less owners than ${owners}`
 						}
-
 						if (rarities.hasOwnProperty(category) && highestBid > rarities[category]) {
 							junk = false;
 							reason = `, has high bid.`
@@ -122,7 +129,6 @@
 							junk = false;
 							reason = `, MV over 10.`
 						};
-
 						if (region && whiteList.includes(region)) {
 							junk = false;
 							reason = `, is in whitelisted ${region}.`
@@ -140,7 +146,7 @@
 								cards.length
 							}</p></td><td><p><a target="_blank" href="https://www.nationstates.net/container=${nation}/nation=${nation}/page=ajax3/a=junkcard/card=${id}/season=${season}/User_agent=${main}Script=JunkDaJunk/Author_discord=scrambleds/Author_main_nation=Kractero/autoclose=1\n">Link to Card</a></p></td></tr>\n`;
 						} else {
-							if (jdjMode === "Gift") {
+							if (mode === "Gift") {
 								let token = ""
 								const prepare = await fetch(
 									`https://www.nationstates.net/cgi-bin/api.cgi/?nation=${nation}&cardid=${id}&season=${season}&to=${giftee}&mode=prepare&c=giftcard`,
@@ -181,7 +187,7 @@
 						}
 					}
 				} else {
-					if (cardcount) progress += `<p class="text-blue-400">${nation} has less cards than ${cardcount}, skipping!`
+					if (cards) progress += `<p class="text-blue-400">${nation} has less cards than ${cards}, skipping!`
 					else progress += `<p class="text-blue-400">It is likely ${nation} has 0 cards, skipping!`
 				}
 			} catch (err) {
@@ -204,7 +210,7 @@
 <p class="mb-4">
 	An even faster way to junk and gift/sell cards with <span class="line-through">python</span> JavaScript.
 </p>
-<p class="text-xs mb-16">
+<p class="text-xs mb-16 max-w-sm">
 	The regional whitelist indicates regions to skip when deciding to junk cards. The card count threshold only runs Junking
 	analyzing on specified nations that have over a certain amount of cards. The owner count threshold will indicate cards to skip
 	that have less than the specified amount. The rarity threshold dictates when to skip based on the card's rarity and market value.
@@ -212,20 +218,20 @@
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
 	<form on:submit|preventDefault={() => junkDaJunk(main, puppets)} class="flex flex-col gap-8">
-		<InputCredentials bind:main bind:puppets authenticated={jdjMode === "Gift" ? true : false} />
-		{#if jdjMode === "Gift"}
+		<InputCredentials bind:main bind:puppets authenticated={mode === "Gift" ? true : false} />
+		{#if mode === "Gift"}
 			<Input text={`Gift To`} bind:bindValue={giftee} forValue="giftee" required={true} />
 		{/if}
 		<Textarea text="Regional Whitelist" bind:bindValue={regionalwhitelist} forValue="regions" />
 		<Input text={`Card Count Threshold`} bind:bindValue={cardcount} forValue="card" />
-		<Input text={`Owner Count Threshold`} bind:bindValue={ownercount} forValue="owner" />
+		<Input text={`Owner Count Threshold`} bind:bindValue={owners} forValue="owner" />
 		<div class="flex gap-4 justify-between max-w-lg">
 			<p class="w-24">Rarity Threshold</p>
 			<Rarities bind:rarities={rarities} />
 		</div>
         <div class="flex flex-col lg:flex-row gap-4 justify-between max-w-lg">
             <label class="w-24" for="jdj">JDJ Default Behavior</label>
-			<Select bind:mode={jdjMode} options={['Gift', 'Sell']} />
+			<Select bind:mode={mode} options={['Gift', 'Sell']} />
         </div>
 		<Buttons>
 			<button
diff --git a/src/routes/tools/login/+page.svelte b/src/routes/tools/login/+page.svelte
index 13718ef..0adf028 100644
--- a/src/routes/tools/login/+page.svelte
+++ b/src/routes/tools/login/+page.svelte
@@ -6,15 +6,19 @@
 	import InputCredentials from '$lib/component/InputCredentials.svelte';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Buttons from '$lib/component/Buttons.svelte';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	let progress = '';
 	let puppets = '';
 	let main = '';
 	let content: string;
 	let downloadable = false;
-	onMount(() => ({puppets, main} = loadLocalStorage(["stationPuppets", "stationMain"])));
+	onMount(() => { main = data.parameters.main || loadStorage("useragent") as string || ""; });
 	async function login(puppets: string) {
+		pushHistory(`?main=${main}`)
 		downloadable = false;
 		content = (await nsIterator(puppets, 'Login Sheet', main)) as string;
 		progress = `<p>Finished processing!</p>`;
diff --git a/src/routes/tools/nen/+page.svelte b/src/routes/tools/nen/+page.svelte
index 6aed237..d63a26b 100644
--- a/src/routes/tools/nen/+page.svelte
+++ b/src/routes/tools/nen/+page.svelte
@@ -2,18 +2,25 @@
 	import { onMount } from 'svelte';
 	import { parseXML, sleep } from '$lib/globals';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Buttons from '$lib/component/Buttons.svelte';
 	import Input from '$lib/component/Input.svelte';
 	import Terminal from '$lib/component/Terminal.svelte';
 	import type { Nation } from '$lib/types';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	let progress = "";
 	let main = '';
 	let nennation = '';
 
-	onMount(() => ({main, nennation} = loadLocalStorage(["stationMain", "stationNENNation"])));
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		nennation = data.parameters.nennation || loadStorage("nenNation") as string || "";
+	});
 
-	async function findWA() {
+	async function nen() {
+		pushHistory(`?main=${main}&nennation=${nennation}`)
 		progress = '';
         const xml: Nation = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?nation=${nennation}&q=endorsements+region+wa`, main);
         if (xml.NATION.UNSTATUS === "Non-member") {
@@ -39,7 +46,7 @@
 <p class="mb-16">Specify a nation and get all the regionmates not endorsing them.</p>
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
-	<form on:submit|preventDefault={() => findWA()} class="flex flex-col gap-8">
+	<form on:submit|preventDefault={() => nen()} class="flex flex-col gap-8">
 		<Input text={`User Agent`} bind:bindValue={main} forValue="main" required={true} />
 		<Input text={`Nation to Check`} bind:bindValue={nennation} forValue="nennation" required={true} />
 		<Buttons />
diff --git a/src/routes/tools/ping/+page.svelte b/src/routes/tools/ping/+page.svelte
index 811d4dc..ff81e09 100644
--- a/src/routes/tools/ping/+page.svelte
+++ b/src/routes/tools/ping/+page.svelte
@@ -4,20 +4,28 @@
 	import { sleep } from '$lib/globals';
 	import Head from '$lib/component/Head.svelte';
 	import Buttons from '$lib/component/Buttons.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Terminal from '$lib/component/Terminal.svelte';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	const abortController = new AbortController();
-	let puppets = '';
-	let main = '';
-	let password = '';
 	let progress = "";
 	let stoppable = false;
 	let stopped = false;
+	let puppets = '';
+	let main = '';
+	let password = '';
 
-	onMount(() => ({puppets, main, password} = loadLocalStorage(["stationPuppets", "stationMain", "stationPassword"])));
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		puppets = loadStorage("puppets") as string || "";
+		password = loadStorage("password") as string || "";
+	});
 	onDestroy(() => abortController.abort());
 
 	async function ping(main: string, puppets: string, password: string) {
+		pushHistory(`?main=${main}`)
 		stoppable = true;
 		stopped = false;
 		progress = '';
diff --git a/src/routes/tools/roc/+page.svelte b/src/routes/tools/roc/+page.svelte
index 802e501..5277a62 100644
--- a/src/routes/tools/roc/+page.svelte
+++ b/src/routes/tools/roc/+page.svelte
@@ -8,19 +8,27 @@
 	import Terminal from '$lib/component/Terminal.svelte';
 	import type { Census, Nation } from '$lib/types';
 	import Textarea from '$lib/component/Textarea.svelte';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	const abortController = new AbortController();
 	let progress = '';
 	let stoppable = false;
 	let stopped = false;
 	let main = '';
-	let top = 100;
-	let days = 30;
+	let top = "100";
+	let days = "30";
 	let specific = '';
-
-	onMount(() => ({main, top, days, specific} = loadLocalStorage(["stationMain", "stationROCTop", "stationROCDays", "stationSpecific"])));
-	onDestroy(() => abortController.abort());
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		top = data.parameters.top || loadStorage("rocTop") as string || "100";
+		days = data.parameters.days || loadStorage("rocDays") as string || "30";
+		specific = loadStorage("rocSpecific") as string || "";
+	});
 
 	async function rateOfChange(main: string) {
+		pushHistory(`?main=${main}&top=${top}&days=${days}`)
 		stopped = false;
 		stoppable = true;
 		let names: any[] = [];
@@ -28,7 +36,7 @@
 		let ratesOfChange: Array<rocTuple> = [];
 		progress = '';
 		if (!specific) {
-			for (let i = 0; i < Math.ceil(top / 20); i++) {
+			for (let i = 0; i < Math.ceil(Number(top) / 20); i++) {
 				let start = 1 + i * 20;
 				if (abortController.signal.aborted) {
 					break;
@@ -37,13 +45,12 @@
 				names = names.concat(xml.WORLD.CENSUSRANKS.NATIONS.NATION.map(nation => nation.NAME));
 				await sleep(700);
 			}
-			names = names.slice(0, top);
+			names = names.slice(0, Number(top));
 		} else {
 			names = specific.split('\n')
 		}
-		console.log(names)
 		const currentTimestamp = Math.floor(Date.now() / 1000);
-		const fromTimestamp = currentTimestamp - days * 24 * 60 * 60;
+		const fromTimestamp = currentTimestamp - Number(days) * 24 * 60 * 60;
 		for (let j = 0; j < names.length; j++) {
 			const nation = names[j];
 			if (abortController.signal.aborted || stopped) {
@@ -57,7 +64,7 @@
 				const scores = point.map((point) => Number(point.SCORE));
 				const [maxTimestamp, minTimestamp] = [Math.max(...timestamps), Math.min(...timestamps)];
 				const [maxScore, minScore] = [scores[timestamps.indexOf(maxTimestamp)], scores[timestamps.indexOf(minTimestamp)]];
-				const rateOfChange = ((maxScore - minScore) / days).toFixed(2);
+				const rateOfChange = ((maxScore - minScore) / Number(days)).toFixed(2);
 				ratesOfChange.push([nation, Number(rateOfChange)]);
 			} else {
 				ratesOfChange.push([nation, Number(point.SCORE)]);
@@ -94,16 +101,19 @@
 	<a class="underline" href="https://github.com/Thorn1000/NS-RoC" target="_blank" rel="noreferrer noopener">
 		Original by Thorn1000
 	</a>, rewritten in JS for browser use by Kractero</p>
-<p class="mb-16">
+<p class="mb-1">
 	Calculate the rate of change in deck value for the top X NS players, over X days.
 </p>
+<p class="text-xs mb-16">
+	Specific indicates to search for specific nation's RoC, and is enabled only when top is empty.
+</p>
 
 <div class="lg:w-[1024px] lg:max-w-5xl flex flex-col lg:flex-row gap-8 break-normal">
 	<form on:submit|preventDefault={() => rateOfChange(main)} class="flex flex-col gap-8">
 		<Input text={`User Agent`} bind:bindValue={main} forValue="main" required={true} />
 		<Input text={`Top ${top}`} bind:bindValue={top} forValue="top" required={true} disabled={specific !== ""} />
-		<Input text={`Over ${days} days`} bind:bindValue={days} forValue="days" required={true} disabled={specific !== ""} />
-		<Textarea text="Specific" bind:bindValue={specific} forValue="specific" required />
+		<Textarea text="Specific" bind:bindValue={specific} forValue="specific" required disabled={top !== ""} />
+		<Input text={`Over ${days} days`} bind:bindValue={days} forValue="days" required={true} />
 		<Buttons>
 			<button
 				type="button"
diff --git a/src/routes/tools/spyglass/+page.svelte b/src/routes/tools/spyglass/+page.svelte
index 7d95039..44ea33f 100644
--- a/src/routes/tools/spyglass/+page.svelte
+++ b/src/routes/tools/spyglass/+page.svelte
@@ -6,11 +6,16 @@
 	import { parseXML, parser } from '$lib/globals';
 	import * as ExcelJS from 'exceljs';
 	import type { NSRegion } from '$lib/types';
-
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	import { onMount } from 'svelte';
+	export let data: PageData;
 	let main = '';
 	let progress = '';
 	let workbook: any;
 	let downloadable = false;
+	onMount(() => { main = data.parameters.main || loadStorage("useragent") as string || ""; });
 	function sanitize(string: string) {
 		try {
 			if (['=', '+', '-', '@'].includes(string.charAt(0))) {
@@ -24,6 +29,7 @@
 	}
 
 	async function glass() {
+		pushHistory(`?main=${main}`)
 		downloadable = false
 		progress += `<p>Gathering founderless regions.</p>`
 		const governorless = await parseXML('https://www.nationstates.net/cgi-bin/api.cgi?q=regionsbytag;tags=governorless', main);
diff --git a/src/routes/tools/whereswa/+page.svelte b/src/routes/tools/whereswa/+page.svelte
index 716ec83..74c3b91 100644
--- a/src/routes/tools/whereswa/+page.svelte
+++ b/src/routes/tools/whereswa/+page.svelte
@@ -3,14 +3,21 @@
 	import InputCredentials from '$lib/component/InputCredentials.svelte';
 	import { parseXML } from '$lib/globals';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Buttons from '$lib/component/Buttons.svelte';
 	import Terminal from '$lib/component/Terminal.svelte';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
 	let progress = "";
 	let puppets = '';
 	let main = '';
-	onMount(() => ({puppets, main} = loadLocalStorage(["stationPuppets", "stationMain"])));
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		puppets = loadStorage("puppets") as string || "";
+	});
 	async function findWA(main: string, puppets: string) {
+		pushHistory(`?main=${main}`)
 		progress = '';
 		const puppetsList = puppets.split('\n');
 		const xml = await parseXML(`https://www.nationstates.net/cgi-bin/api.cgi?wa=1&q=members`, main);
diff --git a/src/routes/tools/wiz/+page.svelte b/src/routes/tools/wiz/+page.svelte
index 4c6d329..1ed3813 100644
--- a/src/routes/tools/wiz/+page.svelte
+++ b/src/routes/tools/wiz/+page.svelte
@@ -3,9 +3,12 @@
 	import InputCredentials from '$lib/component/InputCredentials.svelte';
 	import { parseXML, sleep } from '$lib/globals';
 	import Head from '$lib/component/Head.svelte';
-	import { loadLocalStorage } from '$lib/loadLocalStorage';
 	import Buttons from '$lib/component/Buttons.svelte';
 	import Terminal from '$lib/component/Terminal.svelte';
+	import type { PageData } from './$types';
+	import { loadStorage } from '$lib/loadStorage';
+	import { pushHistory } from '$lib/helpers/utils';
+	export let data: PageData;
     const abortController = new AbortController();
 	let puppets = '';
 	let main = '';
@@ -13,10 +16,14 @@
 	let stoppable = false;
 	let stopped = true;
 
-	onMount(() => ({main, puppets} = loadLocalStorage(["stationMain", "stationPuppets"])));
+	onMount(() => {
+		main = data.parameters.main || loadStorage("useragent") as string || "";
+		puppets = loadStorage("puppets") as string || "";
+	});
     onDestroy(() => abortController.abort());
 
 	async function lastactivity(main: string, puppets: string) {
+		pushHistory(`?main=${main}`)
 		progress = "";
 		stoppable = true;
 		stopped = false;