diff --git a/heat-stack/app/components/WeatherExample.tsx b/heat-stack/app/components/WeatherExample.tsx
deleted file mode 100644
index 01fbb8b6..00000000
--- a/heat-stack/app/components/WeatherExample.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { loader } from "#app/root.tsx";
-import test from "@playwright/test";
-import { json } from "@remix-run/node"; // or cloudflare/deno
-import { useLoaderData } from "@remix-run/react";
-
-// weather `loader` is in root.tsx
-
-export function WeatherExample() {
-
-  const one_loader = useLoaderData<typeof loader>();
-  if (!one_loader.weather) {
-    return <div>Loading weather...</div>;
-  }
-  const time: string = one_loader.weather.daily?.time[0]
-  const temp: number = one_loader.weather.daily?.temperature_2m_max[0]
-  
-  return (
-    <div>
-      <span>time/temp first item: {time}/{temp}</span>
-    </div>
-  );
-}
diff --git a/heat-stack/app/components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx
index 4866f871..11169f4f 100644
--- a/heat-stack/app/components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx
+++ b/heat-stack/app/components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx
@@ -23,46 +23,46 @@ export function CurrentHeatingSystem(props: CurrentHeatingSystemProps) {
 			{/* <Form method="post" action="/current"> */}
 			<div>
 				{' '}
-				<Label htmlFor="fuelType" className={`${subtitleClass}`}>
+				<Label htmlFor="fuel_type" className={`${subtitleClass}`}>
 					Fuel Type
 				</Label>
 				<div className="flex space-x-4">
 					<div className="basis-1/4">
-						<Input {...getInputProps(props.fields.fuelType, { type: "text" })} />
+						<Input {...getInputProps(props.fields.fuel_type, { type: "text" })} />
 					</div>
 				</div>
 				<div className="min-h-[32px] px-4 pb-3 pt-1">
 					<ErrorList
-						id={props.fields.fuelType.errorId}
-						errors={props.fields.fuelType.errors}
+						id={props.fields.fuel_type.errorId}
+						errors={props.fields.fuel_type.errors}
 					/>
 				</div>
 			</div>
 
-			<Label htmlFor="heatingSystemEfficiency" className={`${subtitleClass}`}>
+			<Label htmlFor="heating_system_efficiency" className={`${subtitleClass}`}>
 				Heating system efficiency %
 			</Label>
 			<div className="flex space-x-4">
 				<div className={`basis-1/3`}>
-					<Input placeholder="(Percent)" {...getInputProps(props.fields.heatingSystemEfficiency, { type: "text" })} />
+					<Input placeholder="(Percent)" {...getInputProps(props.fields.heating_system_efficiency, { type: "text" })} />
 					<div className={`${descriptiveClass}`}>
 						Typical natural gas efficiency is 80%-95%
 					</div>
 					<div className="min-h-[32px] px-4 pb-3 pt-1">
 						<ErrorList
-							id={props.fields.heatingSystemEfficiency.errorId}
-							errors={props.fields.heatingSystemEfficiency.errors}
+							id={props.fields.heating_system_efficiency.errorId}
+							errors={props.fields.heating_system_efficiency.errors}
 						/>
 					</div>
 				</div>
 			</div>
 
-			<Label htmlFor="designTemperatureOverride" className={`${subtitleClass}`}>
+			<Label htmlFor="design_temperature_override" className={`${subtitleClass}`}>
 				Design temperature override (°F)
 			</Label>
 			<div className="flex space-x-4">
 				<div className={`basis-1/3`}>
-					<Input placeholder="(Optional)" {...getInputProps(props.fields.designTemperatureOverride, { type: "text" })} />
+					<Input placeholder="(Optional)" {...getInputProps(props.fields.design_temperature_override, { type: "text" })} />
 					<div>
 						<div className={`${descriptiveClass}`}>
 							65°F is the 99% ASHRAE heating design temperature at this location
@@ -70,8 +70,8 @@ export function CurrentHeatingSystem(props: CurrentHeatingSystemProps) {
 					</div>
 					<div className="min-h-[32px] px-4 pb-3 pt-1">
 						<ErrorList
-							id={props.fields.designTemperatureOverride.errorId}
-							errors={props.fields.designTemperatureOverride.errors}
+							id={props.fields.design_temperature_override.errorId}
+							errors={props.fields.design_temperature_override.errors}
 						/>
 					</div>
 				</div>
@@ -81,41 +81,41 @@ export function CurrentHeatingSystem(props: CurrentHeatingSystemProps) {
 				<h6 className={`${subtitleClass}`}>Thermostat Settings</h6>
 				<div className="mt-4 flex space-x-4">
 					<div className="basis-1/3">
-						<Label htmlFor="thermostatSetPoint">
+						<Label htmlFor="thermostat_set_point">
 							<b>Set Point (°F)</b>{' '}
 						</Label>
-						<Input placeholder="(Fahrenheit)" {...getInputProps(props.fields.thermostatSetPoint, { type: "text" })} />
+						<Input placeholder="(Fahrenheit)" {...getInputProps(props.fields.thermostat_set_point, { type: "text" })} />
 						<div className={`${descriptiveClass}`}>
 							Usual thermostat setting for heating
 						</div>
 						<div className="min-h-[32px] px-4 pb-3 pt-1">
 							<ErrorList
-								id={props.fields.thermostatSetPoint.errorId}
-								errors={props.fields.thermostatSetPoint.errors}
+								id={props.fields.thermostat_set_point.errorId}
+								errors={props.fields.thermostat_set_point.errors}
 							/>
 						</div>
 					</div>
 					<div className="basis-1/3">
-						<Label htmlFor="setbackTemperature">
+						<Label htmlFor="setback_temperature">
 							<b>Setback Temperature (°F)</b>
 						</Label>
-						<Input placeholder="(Optional)" {...getInputProps(props.fields.setbackTemperature, { type: "text" })} />
+						<Input placeholder="(Optional)" {...getInputProps(props.fields.setback_temperature, { type: "text" })} />
 						<div className={`${descriptiveClass}`}>
 							Enter if thermostat is programmed to a lower or higher temperature
 							during working or sleep hours
 						</div>
 						<div className="min-h-[32px] px-4 pb-3 pt-1">
 							<ErrorList
-								id={props.fields.setbackTemperature.errorId}
-								errors={props.fields.setbackTemperature.errors}
+								id={props.fields.setback_temperature.errorId}
+								errors={props.fields.setback_temperature.errors}
 							/>
 						</div>
 					</div>
 					<div className="basis-1/3">
-						<Label htmlFor="setbackHoursPerDay">
+						<Label htmlFor="setback_hours_per_day">
 							<b>Setback hours per day</b>
 						</Label>
-						<Input placeholder="(Optional)" {...getInputProps(props.fields.setbackHoursPerDay, { type: "text" })} />
+						<Input placeholder="(Optional)" {...getInputProps(props.fields.setback_hours_per_day, { type: "text" })} />
 						<div className={`${descriptiveClass}`}>
 							Typical natural gas efficiency is 80%-95%
 						</div>
@@ -125,8 +125,8 @@ export function CurrentHeatingSystem(props: CurrentHeatingSystemProps) {
 						</div>
 						<div className="min-h-[32px] px-4 pb-3 pt-1">
 							<ErrorList
-								id={props.fields.setbackHoursPerDay.errorId}
-								errors={props.fields.setbackHoursPerDay.errors}
+								id={props.fields.setback_hours_per_day.errorId}
+								errors={props.fields.setback_hours_per_day.errors}
 							/>
 						</div>
 					</div>
diff --git a/heat-stack/app/components/ui/heat/CaseSummaryComponents/HeatLoadAnalysis.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/HeatLoadAnalysis.tsx
index 8b0521aa..983137c6 100644
--- a/heat-stack/app/components/ui/heat/CaseSummaryComponents/HeatLoadAnalysis.tsx
+++ b/heat-stack/app/components/ui/heat/CaseSummaryComponents/HeatLoadAnalysis.tsx
@@ -3,7 +3,7 @@ import { HeatLoad } from './Graphs/HeatLoad.tsx'
 import { WholeHomeUAComparison } from './Graphs/WholeHomeUAComparison.tsx'
 
 export function Graphs() {
-	const fuelType = 'Natural Gas'
+	const fuel_type = 'Natural Gas'
 	const titleClassTailwind = 'text-5xl font-extrabold tracking-wide'
 	const componentMargin = 'mt-10'
 	return (
@@ -12,7 +12,7 @@ export function Graphs() {
 				Heat Load Analysis
 			</h2>
 			Fuel Type
-			{fuelType}
+			{fuel_type}
 			<AnalysisHeader />
 			<HeatLoad />
 			<WholeHomeUAComparison />
diff --git a/heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx
index 317ddc72..b4106e02 100644
--- a/heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx
+++ b/heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx
@@ -92,18 +92,18 @@ export function HomeInformation(props: HomeInformationProps) {
 
 				<div className="mt-9">
 					<h6>
-						<Label className={`${subtitleClass}`} htmlFor="livingArea">
+						<Label className={`${subtitleClass}`} htmlFor="living_area">
 							Living Area (sf)
 						</Label>
 					</h6>
 
 					<div className="mt-4 flex space-x-2">
 						<div>
-							<Input {...getInputProps(props.fields.livingArea, { type: "text" })}  />
+							<Input {...getInputProps(props.fields.living_area, { type: "text" })}  />
 							<div className="min-h-[32px] px-4 pb-3 pt-1">
 							<ErrorList
-								id={props.fields.livingArea.errorId}
-								errors={props.fields.livingArea.errors}
+								id={props.fields.living_area.errorId}
+								errors={props.fields.living_area.errors}
 							/>
 							</div>
 							<p className={`${descriptiveClass}`}>
diff --git a/heat-stack/app/root.tsx b/heat-stack/app/root.tsx
index c42e0408..745f66ff 100644
--- a/heat-stack/app/root.tsx
+++ b/heat-stack/app/root.tsx
@@ -56,8 +56,6 @@ import {
 	makeTimings,
 	time,
 } from './utils/timing.server.ts'
-import { WeatherExample } from './components/WeatherExample.tsx'
-import { Weather } from './WeatherExample.js'
 import { honeypot } from './utils/honeypot.server.ts'
 import { combineHeaders, getDomainUrl, getUserImgSrc } from './utils/misc.tsx'
 import { useNonce } from './utils/nonce-provider.ts'
@@ -138,15 +136,9 @@ export async function loader({ request }: LoaderFunctionArgs) {
 	// }
 	// const { toast, headers: toastHeaders } = await getToast(request)
 	const honeyProps = honeypot.getInputProps()
-	// Weather station data
-	const w_href: string =
-		'https://archive-api.open-meteo.com/v1/archive?latitude=52.52&longitude=13.41&daily=temperature_2m_max&timezone=America%2FNew_York&start_date=2022-01-01&end_date=2023-08-30&temperature_unit=fahrenheit'
-	const w_res: Response = await fetch(w_href)
-	const weather: Weather = (await w_res.json()) as Weather
 
 	return json(
 		{
-			weather,
 			user,
 			requestInfo: {
 				hints: getHints(request),
diff --git a/heat-stack/app/routes/_heat+/Inputs1.tsx b/heat-stack/app/routes/_heat+/Inputs1.tsx
index e3a40908..558d050b 100644
--- a/heat-stack/app/routes/_heat+/Inputs1.tsx
+++ b/heat-stack/app/routes/_heat+/Inputs1.tsx
@@ -23,7 +23,7 @@ const addressMaxLength = 100
 const HomeInformationSchema = z.object({
 	name: z.string().min(1).max(nameMaxLength),
 	address: z.string().min(1).max(addressMaxLength),
-	livingArea: z.number().min(1),
+	living_area: z.number().min(1),
 })
 
 export async function action({ request, params }: ActionFunctionArgs) {
@@ -56,7 +56,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
 	// - [ ] Build form #2 and #3
 	// - [ ] Form errors (if we think of a use case - 2 fields conflicting...)
 
-	const { name, address, livingArea } = submission.value
+	const { name, address, living_area } = submission.value
 
 	// await updateNote({ id: params.noteId, title, content })
 
diff --git a/heat-stack/app/routes/_heat+/single.tsx b/heat-stack/app/routes/_heat+/single.tsx
index 0d0dda3b..2b12a64e 100644
--- a/heat-stack/app/routes/_heat+/single.tsx
+++ b/heat-stack/app/routes/_heat+/single.tsx
@@ -6,8 +6,8 @@ import { invariantResponse } from '@epic-web/invariant'
 import { json, ActionFunctionArgs } from '@remix-run/node'
 import { Form, redirect, useActionData } from '@remix-run/react'
 import { z } from 'zod'
-import GeocodeUtil from '#app/utils/GeocodeUtil.js'
-import WeatherUtil from '#app/utils/WeatherUtil.js'
+import GeocodeUtil from '#app/utils/GeocodeUtil'
+import WeatherUtil from '#app/utils/WeatherUtil'
 import PyodideUtil from '#app/utils/pyodide.util.js'
 import * as pyodideModule from 'pyodide'
 
@@ -27,48 +27,17 @@ import * as pyodideModule from 'pyodide'
 // - [x] import pyodide into single.tsx and run it with genny
 //     - [x] Add to README: don't forget `npm run buildpy` to build rules engine into `public/pyodide-env` if you start a new codingspace or on local.
 // - [x] figure out how to set field defaults with Conform to speed up trials (defaultValue prop on input doesn't work) https://conform.guide/api/react/useForm
-// - [ ] (To reproduce: Fill out and submit form and go back and submit form again) How do we stop the geocoder helper from concatenating everyone's past submitted addresses onto querystring in single.tsx action? 
+// - [x] (To reproduce: Fill out and submit form and go back and submit form again) How do we stop the geocoder helper from concatenating everyone's past submitted addresses onto querystring in single.tsx action? 
 // example: [MSW] Warning: intercepted a request without a matching request handler: GET https://geocoding.geo.census.gov/geocoder/locations/onelineaddress?address=1+Broadway%2C+Cambridge%2C+MA+02142&format=json&benchmark=2020&address=1+Broadway%2C+Cambridge%2C+MA+02142&format=json&benchmark=2020
-// - [ ] Zod error at these three lines in Genny because the .optional() zod setting (see ./types/index.tsx) is getting lost somehow, refactor as much of genny away as possible: thermostatSetPoint: oldSummaryInput.thermostat_set_point, setbackTemperature: oldSummaryInput.setback_temperature, setbackHoursPerDay: oldSummaryInput.setback_hours_per_day,
+// - [x] Zod error at these three lines in Genny because the .optional() zod setting (see ./types/index.tsx) is getting lost somehow, refactor as much of genny away as possible: thermostat_set_point: oldSummaryInput.thermostat_set_point, setback_temperature: oldSummaryInput.setback_temperature, setback_hours_per_day: oldSummaryInput.setback_hours_per_day,
 // - [ ] Display Conform's form-wide errors, currently thrown away (if we think of a use case - 2 fields conflicting...)
+// - [ ] Pass CSV and form data to rules engine
+// - [ ] Use start_date and end_date from rules-engine output of CSV parsing rather than 2 year window. 
 // - [ ] (use data passing function API from #172 from rules engine) to Build table component form
 // - [ ] Michelle proposes always set form default values when run in development
 // - [ ] Pass modified table back to rules engine for full cycle revalidation 
 // - [ ] Feature v2: How about a dropdown? census geocoder address form picker component to choose which address from several, if ambigous or bad.
-
-/**
- * ZodError: [
-  {
-    "code": "invalid_type",
-    "expected": "number",
-    "received": "null",
-    "path": [
-      "setbackTemperature"
-    ],
-    "message": "Expected number, received null"
-  },
-  {
-    "code": "invalid_type",
-    "expected": "number",
-    "received": "null",
-    "path": [
-      "setbackHoursPerDay"
-    ],
-    "message": "Expected number, received null"
-  }
-]
-    at Object.get error [as error] (file:///workspaces/home-energy-analysis-tool/heat-stack/node_modules/zod/lib/index.mjs:538:31)
-    at ZodIntersection.parse (file:///workspaces/home-energy-analysis-tool/heat-stack/node_modules/zod/lib/index.mjs:638:22)
-    at genny (file:///workspaces/home-energy-analysis-tool/heat-stack/build/index.js?update=1715733465459:7338:21)
-    at action13 (file:///workspaces/home-energy-analysis-tool/heat-stack/build/index.js?update=1715733465459:7370:32)
-    at processTicksAndRejections (node:internal/process/task_queues:95:5)
-    at /workspaces/home-energy-analysis-tool/heat-stack/node_modules/@sentry/src/utils/instrumentServer.ts:266:36
-    at Object.callRouteActionRR (/workspaces/home-energy-analysis-tool/heat-stack/node_modules/@remix-run/server-runtime/dist/data.js:35:16)
-    at callLoaderOrAction (/workspaces/home-energy-analysis-tool/heat-stack/node_modules/@remix-run/router/router.ts:4011:16)
-    at submit (/workspaces/home-energy-analysis-tool/heat-stack/node_modules/@remix-run/router/router.ts:3131:16)
-    at queryImpl (/workspaces/home-energy-analysis-tool/heat-stack/node_modules/@remix-run/router/router.ts:3066:22)
- */
-
+// - [ ] Treat design_temperature distinctly from design_temperature_override, and design_temperature_override should be kept in state like name or address
 
 // Ours
 import { ErrorList } from '#app/components/ui/heat/CaseSummaryComponents/ErrorList.tsx'
@@ -85,32 +54,21 @@ const addressMaxLength = 100
 /** Modeled off the conform example at
  *     https://github.com/epicweb-dev/web-forms/blob/b69e441f5577b91e7df116eba415d4714daacb9d/exercises/03.schema-validation/03.solution.conform-form/app/routes/users%2B/%24username_%2B/notes.%24noteId_.edit.tsx#L48 */
 
-// const HomeInformationSchema = {
-// 	name: z.string().min(1).max(nameMaxLength),
-// 	address: z.string().min(1).max(addressMaxLength),
-// 	livingSpace: z.number().min(1),
-// }
-// // type Home = z.infer<typeof HomeSchema>
-
-// // TODO Next: Ask an LLM how we get fuelType out of HomeSchema from zod
-
-const HomeFormSchema = Home.pick({ livingArea: true })
+const HomeFormSchema = Home.pick({ living_area: true })
 	.and(Location.pick({ address: true }))
 	.and(Case.pick({ name: true }))
 
 const CurrentHeatingSystemSchema = Home.pick({
-	fuelType: true,
-	heatingSystemEfficiency: true,
-	designTemperatureOverride: true,
-	thermostatSetPoint: true,
-	setbackTemperature: true,
-	setbackHoursPerDay: true,
+	fuel_type: true,
+	heating_system_efficiency: true,
+	design_temperature_override: true,
+	thermostat_set_point: true,
+	setback_temperature: true,
+	setback_hours_per_day: true,
 })
 
 const Schema = HomeFormSchema.and(CurrentHeatingSystemSchema)
 
-// const EnergyUseSchema = '';
-
 export async function action({ request, params }: ActionFunctionArgs) {
 	// Checks if url has a homeId parameter, throws 400 if not there
 	// invariantResponse(params.homeId, 'homeId param is required')
@@ -144,13 +102,13 @@ export async function action({ request, params }: ActionFunctionArgs) {
 	const {
 		name,
 		address,
-		livingArea,
-		fuelType,
-		heatingSystemEfficiency,
-		thermostatSetPoint,
-		setbackTemperature,
-		setbackHoursPerDay,
-		designTemperatureOverride,
+		living_area,
+		fuel_type,
+		heating_system_efficiency,
+		thermostat_set_point,
+		setback_temperature,
+		setback_hours_per_day,
+		design_temperature_override,
 	} = submission.value
 
 	// await updateNote({ id: params.noteId, title, content })
@@ -163,14 +121,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
 	console.log('loading PU/PM/GU/WU')
 
-	// CONSOLE: loading PU/PM/GU/WU
-	// Error: No known package with name 'pydantic_core'
-	// Error: No known package with name 'pydantic_core'
-	// 	at addPackageToLoad (/workspaces/home-energy-analysis-tool/heat-stack/public/pyodide-env/pyodide.asm.js:9:109097)
-	// 	at recursiveDependencies (/workspaces/home-energy-analysis-tool/heat-stack/public/pyodide-env/pyodide.asm.js:9:109370)
-	// 	at loadPackage (/workspaces/home-energy-analysis-tool/heat-stack/public/pyodide-env/pyodide.asm.js:9:111435)
-	// 	at initializePackageIndex (/workspaces/home-energy-analysis-tool/heat-stack/public/pyodide-env/pyodide.asm.js:9:108508)
-
 	// const PU = PyodideUtil.getInstance();
 	// const PM = await PU.getPyodideModule();
 	const GU = new GeocodeUtil()
@@ -186,132 +136,63 @@ export async function action({ request, params }: ActionFunctionArgs) {
 	}
 	const runPythonScript = async () => {
 		const pyodide: any = await getPyodide()
-		// 	// console.log(engine);
-		// 	// await pyodide.loadPackage('numpy')
-
-		// 	/* NOTES for pyodide-core:
-		// 		  need to be a special version from the release page, no pure whl: https://github.com/pydantic/pydantic-core/pull/128
-		// 		  get it from https://github.com/pydantic/pydantic-core/releases e.g. https://github.com/pydantic/pydantic-core/releases/download/v2.14.5/pydantic_core-2.14.5-cp311-cp311-emscripten_3_1_32_wasm32.whl
-		// 	*/
-		// 	await pyodide.loadPackage(
-		// 		'public/pyodide-env/pydantic_core-2.14.5-cp311-cp311-emscripten_3_1_32_wasm32.whl',
-		// 	)
-
-		// 	/* NOTES for pydantic, typing-extensions, annotated_types:
-		// 		pyodide should match pyodide-core somewhat.
-		// 		typing-extensions needs specific version per https://github.com/pyodide/pyodide/issues/4234#issuecomment-1771735148
-		// 		try getting it from
-		// 		   - https://pypi.org/project/pydantic/#files
-		// 		   - https://pypi.org/project/typing-extensions/
-		// 		   - https://pypi.org/project/annotated-types/#files
-		// 	*/
-		// 	await pyodide.loadPackage(
-		// 		'public/pyodide-env/pydantic-2.5.2-py3-none-any.whl',
-		// 	)
-		// 	await pyodide.loadPackage(
-		// 		'public/pyodide-env/typing_extensions-4.8.0-py3-none-any.whl',
-		// 	)
-		// 	await pyodide.loadPackage(
-		// 		'public/pyodide-env/annotated_types-0.5.0-py3-none-any.whl',
-		// 	)
-
-		// 	/* NOTES FOR DEBUGGING new requirements.txt
-		// 		  and getting specific versions of pure whl */
-		// 	// the below works but uses the internet/pypi content delivery network rather than localhost.
-		// 	// await pyodide.loadPackage('micropip')
-		// 	// const micropip = await pyodide.pyimport('micropip')
-		// 	// await micropip.install([
-		// 	// 	'typing-extensions==4.8.0',
-		// 	// 	'pydantic_core==2.14.5',
-		// 	// 	'pydantic==2.5.2',
-		// 	// ])
-		// 	// await micropip.install(['annotated-types'])
-
-		// 	await pyodide.loadPackage(
-		// 		'../rules-engine/dist/rules_engine-0.0.1-py3-none-any.whl',
-		// 	)
-
 		return pyodide
 	}
 	// consider running https://github.com/codeforboston/home-energy-analysis-tool/blob/main/rules-engine/tests/test_rules_engine/test_engine.py
 	const pyodide: any = await runPythonScript()
 	//////////////////////
 
-	/**
-	 *
-	 * @param longitude
-	 * @param latitude
-	 * @param start_date
-	 * @param end_date
-	 * @returns {SI,TIWD,BI} Summary input: hardcoded data.TIWD: TemperatureInput: WeatherData from calling open meto API
-	 * Billing input: hardcoded data
-	 *
-	 * Function just to generate test data. inputs come from the values entered in from HomeInformation component
-	 */
-	async function genny(
-		longitude: number,
-		latitude: number,
-		start_date: string,
-		end_date: string,
-	) {
-		// SI = new SummaryInput(6666,"GAS",80,67,null,null,60);
-		// was living_area: number, fuel_type: FuelType, heating_system_efficiency: number, thermostat_set_point: number, setback_temperature: number | null, setback_hours_per_day: number | null, design_temperature: number
+	let { x, y } = await GU.getLL(address)
+	console.log('geocoded', x, y)
 
-		type SchemaZodFromFormType = z.infer<typeof Schema>
+	// let { SI, TIWD, BI } = await genny(x, y, '2024-01-01', '2024-01-03')
 
-		const oldSummaryInput = {
-			living_area: 6666,
-			fuel_type: 'GAS',
-			heating_system_efficiency: 80,
-			thermostat_set_point: 67,
-			setback_temperature: null,
-			setback_hours_per_day: null,
-			design_temperature: 60,
-		}
+	// PU.runit(SI,null,TIWD,JSON.stringify(BI));
+	// CSV entrypoint parse_gas_bill(data: str, company: NaturalGasCompany)
+	// Main form entrypoint
 
-		const SI: SchemaZodFromFormType = Schema.parse({
-			livingArea: oldSummaryInput.living_area,
-			address: '123 Main St', // Provide a valid address
-			name: 'My Home', // Provide a valid name
-			fuelType:
-				oldSummaryInput.fuel_type === 'GAS'
-					? 'Natural Gas'
-					: oldSummaryInput.fuel_type,
-			heatingSystemEfficiency: oldSummaryInput.heating_system_efficiency,
-			thermostatSetPoint: oldSummaryInput.thermostat_set_point,
-			setbackTemperature: oldSummaryInput.setback_temperature,
-			setbackHoursPerDay: oldSummaryInput.setback_hours_per_day,
-			designTemperatureOverride: oldSummaryInput.design_temperature,
-		})
+	type SchemaZodFromFormType = z.infer<typeof Schema>
 
-		console.log('SI', SI)
+	const SI: SchemaZodFromFormType = Schema.parse({
+		living_area: living_area,
+		address,
+		name: 'My Home',
+		fuel_type,
+		heating_system_efficiency,
+		thermostat_set_point,
+		setback_temperature,
+		setback_hours_per_day,
+		design_temperature_override,
+	})
 
-		// const TIWD: TemperatureInput = await WU.getThatWeathaData(longitude, latitude, start_date, end_date);
-		const TIWD = await WU.getThatWeathaData(
-			longitude,
-			latitude,
-			start_date,
-			end_date,
-		)
-		const BI = [
-			{
-				period_start_date: new Date('2023-12-30'), //new Date("2023-12-30"),
-				period_end_date: new Date('2024-01-06'),
-				usage: 100,
-				inclusion_override: null,
-			},
-		]
-		return { SI, TIWD, BI }
-	}
+	console.log('SI', SI)
 
-	let { x, y } = await GU.getLL(address)
-	console.log('geocoded', x, y)
+	// Get today's date
+	const today = new Date();
 
-	let { SI, TIWD, BI } = await genny(x, y, '2024-01-01', '2024-01-03')
+	// Calculate the date 2 years ago from today
+	const twoYearsAgo = new Date(today);
+	twoYearsAgo.setFullYear(today.getFullYear() - 2);
 
-	// PU.runit(SI,null,TIWD,JSON.stringify(BI));
-	// CSV entrypoint parse_gas_bill(data: str, company: NaturalGasCompany)
-	// Main form entrypoint
+	// Set the start_date and end_date
+	const start_date = twoYearsAgo;
+	const end_date = today;
+
+	// const TIWD: TemperatureInput = await WU.getThatWeathaData(longitude, latitude, start_date, end_date);
+	const TIWD = await WU.getThatWeathaData(
+		x,
+		y,
+		start_date.toISOString().split('T')[0],
+		end_date.toISOString().split('T')[0]
+	)
+	const BI = [
+		{
+			period_start_date: new Date('2023-12-30'), //new Date("2023-12-30"),
+			period_end_date: new Date('2024-01-06'),
+			usage: 100,
+			inclusion_override: null,
+		},
+	]
 
 	return redirect(`/single`)
 }
@@ -325,15 +206,15 @@ export default function Inputs() {
 			return parseWithZod(formData, { schema: Schema })
 		},
 		defaultValue: {
-			livingArea: 3000,
+			living_area: 3000,
 			address: '1 Broadway, Cambridge, MA 02142',
 			name: 'CIC',
-			fuelType: 'Natural Gas',
-			heatingSystemEfficiency: 85,
-			thermostatSetPoint: 68,
-			setbackTemperature: 65,
-			setbackHoursPerDay: 8,
-			// designTemperatureOverride: '',
+			fuel_type: 'Natural Gas',
+			heating_system_efficiency: 85,
+			thermostat_set_point: 68,
+			setback_temperature: 65,
+			setback_hours_per_day: 8,
+			// design_temperature_override: '',
 		} as SchemaZodFromFormType,
 		shouldValidate: 'onBlur',
 	})
diff --git a/heat-stack/app/utils/GeocodeUtil.js b/heat-stack/app/utils/GeocodeUtil.js
deleted file mode 100644
index 22be44e6..00000000
--- a/heat-stack/app/utils/GeocodeUtil.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const BASE_URL =  "https://geocoding.geo.census.gov";
-const ADDRESS_ENDPOINT = "/geocoder/locations/onelineaddress";
-const params = new URLSearchParams();
-
-class GeocodeUtil {
-
-    /**
-     * 
-     * @param {*} address
-     * @returns x,y {x,y} lon/lat. If the given address was valid. I've implemented 0 handling here. 
-     *  This is the happiest of paths, with hardcoded values also...
-     */
-    async getLL(address) {
-        params.append("address",address);
-        params.append("format","json");
-        params.append("benchmark",2020);
-
-        let url = new URL(BASE_URL+ADDRESS_ENDPOINT+"?"+params.toString());
-        let rezzy = await fetch(url);
-        let jrez = await rezzy.json();
-        let coordz = jrez.result.addressMatches[0].coordinates;
-        console.log(coordz);
-        return coordz;
-    }
-}
-
-export default GeocodeUtil;
\ No newline at end of file
diff --git a/heat-stack/app/utils/GeocodeUtil.ts b/heat-stack/app/utils/GeocodeUtil.ts
new file mode 100644
index 00000000..0594e2e2
--- /dev/null
+++ b/heat-stack/app/utils/GeocodeUtil.ts
@@ -0,0 +1,104 @@
+const BASE_URL =  "https://geocoding.geo.census.gov";
+const ADDRESS_ENDPOINT = "/geocoder/geographies/onelineaddress";
+
+interface CensusGeocoderResponse {
+    result: {
+      input: {
+        address: {
+          address: string;
+        };
+        vintage: {
+          isDefault: boolean;
+          id: string;
+          vintageName: string;
+          vintageDescription: string;
+        };
+        benchmark: {
+          isDefault: boolean;
+          benchmarkDescription: string;
+          id: string;
+          benchmarkName: string;
+        };
+      };
+      addressMatches: AddressMatch[];
+    };
+  }
+  
+  interface AddressMatch {
+    tigerLine: {
+      side: string;
+      tigerLineId: string;
+    };
+    geographies: {
+      'State Legislative Districts - Upper': Geography[];
+      'States': Geography[];
+      'Combined Statistical Areas': Geography[];
+      '2020 Urban Areas - Corrected': Geography[];
+      'County Subdivisions': Geography[];
+      'State Legislative Districts - Lower': Geography[];
+      'Incorporated Places': Geography[];
+      'Counties': Geography[];
+      '116th Congressional Districts': Geography[];
+      'Census Tracts': Geography[];
+      'Census Blocks': Geography[];
+    };
+    coordinates: {
+      x: number;
+      y: number;
+    };
+    addressComponents: {
+      zip: string;
+      streetName: string;
+      preType: string;
+      city: string;
+      preDirection: string;
+      suffixDirection: string;
+      fromAddress: string;
+      state: string;
+      suffixType: string;
+      toAddress: string;
+      suffixQualifier: string;
+      preQualifier: string;
+    };
+    matchedAddress: string;
+  }
+  
+  interface Geography {
+    GEOID: string;
+    CENTLAT: string;
+    AREAWATER: number;
+    STATE: string;
+    BASENAME: string;
+    OID: string;
+    LSADC: string;
+    [key: string]: string | number; /* a bit dubious catchall by the
+                                     LLM for all the semi-optional keys */
+  }
+
+class GeocodeUtil {
+
+    /**
+     * 
+     * @param {*} address
+     * @returns x,y {x,y} lon/lat. If the given address was valid. I've implemented 0 handling here. 
+     *  This is the happiest of paths, with hardcoded values also...
+     */
+    async getLL(address: string) {
+        const params = new URLSearchParams();
+
+        params.append("address",address);
+        params.append("format","json");
+        params.append("benchmark", "2020");
+        params.append("vintage","Census2020_Census2020")
+
+        let url = new URL(BASE_URL+ADDRESS_ENDPOINT+"?"+params.toString());
+        let rezzy = await fetch(url);
+        let jrez = await rezzy.json() as CensusGeocoderResponse;
+        // TODO: Return all addresses and let the user choose the right one
+        let coordz = jrez.result.addressMatches[0].coordinates;
+        // console.log(JSON.stringify(jrez, null, 2));
+        return coordz;
+    }
+}
+
+export default GeocodeUtil;
\ No newline at end of file
diff --git a/heat-stack/app/utils/WeatherUtil.js b/heat-stack/app/utils/WeatherUtil.js
deleted file mode 100644
index 3ab4364b..00000000
--- a/heat-stack/app/utils/WeatherUtil.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { time } from "console";
-
-const BASE_URL = "https://archive-api.open-meteo.com";
-const WHATEVER_PATH = "/v1/archive";
-const params = new URLSearchParams();
-
-class WeatherUtil {
-
-    async getThatWeathaData(longitude,latitude,startDate, endDate) {
-        params.append("latitude",latitude);
-        params.append("longitude",longitude);
-        params.append("daily","temperature_2m_max");
-        params.append("timezone","America/New_York");
-        params.append("start_date",startDate);
-        params.append("end_date",endDate);
-        params.append("temperature_unit","fahrenheit");
-
-        let url = new URL(BASE_URL+WHATEVER_PATH+"?"+params.toString());
-        let rezzy = await fetch(url);
-        let jrez = await rezzy.json();
-        let dates = [];
-        jrez.daily.time.forEach(timeStr => {
-            dates.push(new Date(timeStr));
-        });
-        let temperatures = jrez.daily.temperature_2m_max
-        // console.log({dates,temperatures});
-        return {dates,temperatures};
-    }
-}
-
-export default WeatherUtil;
\ No newline at end of file
diff --git a/heat-stack/app/utils/WeatherUtil.ts b/heat-stack/app/utils/WeatherUtil.ts
new file mode 100644
index 00000000..7375ab5c
--- /dev/null
+++ b/heat-stack/app/utils/WeatherUtil.ts
@@ -0,0 +1,59 @@
+const BASE_URL = "https://archive-api.open-meteo.com";
+const WHATEVER_PATH = "/v1/archive";
+
+interface ArchiveApiResponse {
+    latitude: number;
+    longitude: number;
+    generationtime_ms: number;
+    utc_offset_seconds: number;
+    timezone: string;
+    timezone_abbreviation: string;
+    elevation: number;
+    daily_units: {
+        time: string;
+        temperature_2m_max: string;
+    };
+    daily: {
+        time: string[];
+        temperature_2m_max: (number | null)[];
+    };
+}
+
+class WeatherUtil {
+
+    /**
+     * @param {*} longitude 
+     * @param {*} latitude 
+     * @param {*} startDate 
+     * @param {*} endDate 
+     * @returns { object } 
+     * example for 2 years before 4th of June 2024: {
+     *   dates: [ 2022-06-04T00:00:00.000Z, 2022-06-05T00:00:00.000Z, ... ],
+     *   temperatures: [ 71.6, 76.3, ... ]
+     * }
+     */
+    async getThatWeathaData(longitude: number, latitude: number, startDate: string, endDate: string) {
+        const params = new URLSearchParams();
+        
+        params.append("latitude",`${ latitude }`);
+        params.append("longitude",`${ longitude }`);
+        params.append("daily","temperature_2m_max");
+        params.append("timezone","America/New_York");
+        params.append("start_date",startDate);
+        params.append("end_date",endDate);
+        params.append("temperature_unit","fahrenheit");
+
+        let url = new URL(BASE_URL+WHATEVER_PATH+"?"+params.toString());
+        let rezzy = await fetch(url);
+        let jrez = await rezzy.json() as ArchiveApiResponse;
+        let dates: Date[] = [];
+        jrez.daily.time.forEach((timeStr: string) => {
+            dates.push(new Date(timeStr));
+        });
+        let temperatures: (number | null)[] = jrez.daily.temperature_2m_max
+        // console.log({dates,temperatures});
+        return {dates,temperatures};
+    }
+}
+
+export default WeatherUtil;
\ No newline at end of file
diff --git a/heat-stack/types/index.ts b/heat-stack/types/index.ts
index 81533612..c3e566cb 100644
--- a/heat-stack/types/index.ts
+++ b/heat-stack/types/index.ts
@@ -25,16 +25,16 @@ export const Home = z.object({
 	/**
 	 * unit: square feet
 	 */
-	livingArea: z.number().min(500).max(10000),
-	fuelType: z.enum(['Natural Gas','Oil','Propane']),
-	designTemperatureOverride: z.number().optional(),
+	living_area: z.number().min(500).max(10000),
+	fuel_type: z.enum(['Natural Gas','Oil','Propane']),
+	design_temperature_override: z.number().optional(),
 	/**
 	 * unit: percentage in decimal numbers, but not 0 to 1
 	 */
-	heatingSystemEfficiency: z.number().min(60).max(100),
-	thermostatSetPoint: z.number(),
-	setbackTemperature: z.number().optional(),
-	setbackHoursPerDay: z.number().optional(),
+	heating_system_efficiency: z.number().min(60).max(100),
+	thermostat_set_point: z.number(),
+	setback_temperature: z.number().optional(),
+	setback_hours_per_day: z.number().optional(),
 	numberOfOccupants: z.number(),
 	estimatedWaterHeatingEfficiency: z.number(),
 	standByLosses: z.number(),