diff --git a/apps/cli/package.json b/apps/cli/package.json
index 9ea7840..10540ff 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -23,7 +23,9 @@
     "@lifetracker/trpc": "workspace:^",
     "date-fns": "^4.1.0",
     "dotenv": "^16.4.1",
+    "spacetime": "^7.6.2",
     "table": "^6.8.2",
+    "timezone-soft": "^1.5.2",
     "vite-tsconfig-paths": "^5.1.0"
   },
   "devDependencies": {
diff --git a/apps/cli/src/commands/days.ts b/apps/cli/src/commands/days.ts
index 1545900..6489fba 100644
--- a/apps/cli/src/commands/days.ts
+++ b/apps/cli/src/commands/days.ts
@@ -12,6 +12,11 @@ import { format } from "date-fns";
 import { TZDate } from "@date-fns/tz";
 import { utc } from "@date-fns/utc";
 import { getHourFromTime, getTimeFromHour } from "@lifetracker/shared/utils/hours";
+import { timezones } from "@lifetracker/shared/utils/timezones";
+import { hours } from "@lifetracker/db/schema";
+import { doHour } from "./hours";
+import soft from "timezone-soft";
+import spacetime from "spacetime";
 
 function moodToStars(mood: number) {
     // const full_stars = Math.floor(mood / 2);
@@ -20,51 +25,84 @@ function moodToStars(mood: number) {
     return "★".repeat(mood) + "☆".repeat(10 - mood);
 }
 
+function getTimezone(req: string) {
+    try {
+        const tz = soft(req)[0].iana;
+        if (timezones[tz] === undefined) {
+            throw new Error("Valid timezone, but not supported by Lifetracker. Add it to the timezones list in the shared utils or try a different request.");
+        }
+        return tz;
+    } catch (e) {
+        throw new Error("Invalid timezone..." + e);
+    }
+
+}
+
 export const daysCmd = new Command()
     .name("day")
     .description("Get data for a specific day")
-    .argument('<date>', 'A date in ISO-8601 format, or "yesterday", "today", "tomorrow", etc.')
+    .argument('[date]', 'A date in ISO-8601 format, or "yesterday", "today", "tomorrow", etc.', "today")
     .option('-c, --comment <comment>', "edit this day's comment")
     .option('-m, --mood <number>', "edit this day's mood")
-    .action(async (dateQuery: string, flags?) => {
+    .option('-h, --hour <hour...>', "manipulate a specific hour (<time> [code | @] [comment])")
+    .option('-t, --timezone <timezone>', "display times in a specific timezone")
+    .action(async (dateQuery, flags?) => {
         const api = getAPIClient();
 
         try {
+            const timezone = flags?.timezone
+                ? getTimezone(flags.timezone)
+                : getTimezone(Intl.DateTimeFormat().resolvedOptions().timeZone);
+            //  : await api.users.getTimezone.query();
+
             if (flags?.comment || flags?.mood) {
-                const updateProps = { dateQuery: dateQuery, ...flags };
+                console.log(`Updating day with date '${dateQuery}' in timezone '${flags.timezone}'`);
+                const updateProps = { dateQuery: dateQuery, timezone: timezone, ...flags };
                 await api.days.update.mutate(updateProps);
             }
 
-            const day = (await api.days.get.query({ dateQuery: dateQuery }));
+            console.log(`Loading ${dateQuery} in ` + timezone + ` (${spacetime.now(timezone).format('{nice}')})`);
 
+            const day = (await api.days.get.query({ dateQuery: dateQuery, timezone: timezone }));
+
+            console.log(`Snagged day with id '${day.id}'`);
             if (getGlobalOptions().json) {
                 printObject(day);
             } else {
 
                 const moodStr = moodToStars(day.mood);
                 const dateStr = format(day.date, "EEEE, MMMM do", { in: utc });
-                const data: string[][] = [[dateStr, '', moodStr], [day.comment ?? "No comment", '', ''],
-                ["Time", "Category", "Comment"]
+                const data: string[][] = [[dateStr, '', moodStr], [day.comment ?? "", '', ''],
+                [`Time (${timezones[timezone]})`, "Category", "Comment"]
                 ];
 
                 day.hours.forEach((h, i) => {
-                    data.push([getHourFromTime(h.time),
-                    h.categoryName ?? "--", h.comment ?? ""]);
+                    data.push([
+                        getHourFromTime(i, 'twelves', `(${timezones[timezone]})`),
+                        h.categoryName ?? "--",
+                        h.comment ?? ""
+                    ]);
                 })
 
-                console.log(table(data, {
-                    // border: getBorderCharacters("ramac"),
-                    // singleLine: true,
-                    spanningCells: [{ col: 0, row: 1, colSpan: 3 }, { col: 1, row: 2, colSpan: 2 }],
-                    drawVerticalLine: (lineIndex, columnCount) => {
-                        return lineIndex === 0 || lineIndex === columnCount || (lineIndex === 0 && columnCount === 2);
-                    },
-                    drawHorizontalLine: (lineIndex, rowCount) => {
-                        return (lineIndex < 1 || lineIndex === 2 || lineIndex === 3 || lineIndex === rowCount);
-                    },
-                }));
+                if (flags?.hour) {
+                    doHour(day.hours, day, flags.hour, timezone);
+                }
+                else {
+
+                    console.log(table(data, {
+                        // border: getBorderCharacters("ramac"),
+                        // singleLine: true,
+                        spanningCells: [{ col: 0, row: 1, colSpan: 3 }, { col: 1, row: 2, colSpan: 2 }],
+                        drawVerticalLine: (lineIndex, columnCount) => {
+                            return lineIndex === 0 || lineIndex === columnCount || (lineIndex === 0 && columnCount === 2);
+                        },
+                        drawHorizontalLine: (lineIndex, rowCount) => {
+                            return (lineIndex < 1 || lineIndex === 2 || lineIndex === 3 || lineIndex === rowCount);
+                        },
+                    }));
+                }
             }
         } catch (error) {
-            printErrorMessageWithReason("Failed to get day", error as object);
+            printErrorMessageWithReason("Failed", error as object);
         }
     });
diff --git a/apps/cli/src/commands/hours.ts b/apps/cli/src/commands/hours.ts
index c57ff1b..a5fef65 100644
--- a/apps/cli/src/commands/hours.ts
+++ b/apps/cli/src/commands/hours.ts
@@ -11,57 +11,71 @@ import { getBorderCharacters, table } from "table";
 import { format } from "date-fns";
 import { TZDate } from "@date-fns/tz";
 import { getHourFromTime, getTimeFromHour } from "@lifetracker/shared/utils/hours";
-import { ZHour } from "@lifetracker/shared/types/days";
+import { ZDay, ZHour } from "@lifetracker/shared/types/days";
+import soft from "timezone-soft";
+import spacetime from "spacetime";
+import { timezones } from "@lifetracker/shared/utils/timezones";
 
 export const hoursCmd = new Command()
     .name("hour")
     .description("Get or set data for a specific hour")
-    .argument('<date>', 'A date in ISO-8601 format, or "yesterday", "today", "tomorrow", etc.')
     .argument('<hour>', 'An hour between 0-23, or 1-12 [AM/PM]')
     .argument('[code]', 'Optionally set the code for this hour')
     .option('-c, --comment <comment>', "edit this hour's comment")
     .action(async (dateQuery = "today", hour: string, code: string | undefined, flags?) => {
+        return "Hello";
+    });
+
+export async function doHour(hours: ZHour[], day: ZDay, hourFlags: string[], timezone = "UTC") {
+    const hourNum = getTimeFromHour(hourFlags.shift()!);
+    const hour = hours[hourNum];
+
+    if (hourFlags.length == 0) {
+        printHour(hour, hourNum, day, timezone);
+    }
+    else {
         const api = getAPIClient();
 
         let res: string | ZHour;
         try {
-            const props = { dateQuery: dateQuery, time: getTimeFromHour(hour), code: code, ...flags };
-            if (code) {
-                // Update
-                console.log(props);
-                res = await api.hours.update.mutate({ ...props });
-            }
-            else {
-                // Get
-                res = await api.hours.get.query({ ...props });
+            if (hourFlags[0] == "@") {
+
+                if (!hour.categoryCode) {
+                    throw new Error("No category code yet -- '@' is meant to set the comment when the category is already set.");
+                }
+                else {
+                    hourFlags[0] = hour.categoryCode?.toString();
+                }
             }
+            const props = { dateQuery: hour.date!, time: hour.time, code: hourFlags[0], comment: hourFlags[1] || null };
+            res = await api.hours.update.mutate({ ...props });
+            printHour(res as ZHour, hourNum, day, timezone);
 
         }
         catch (error) {
             printErrorMessageWithReason("Failed to manipulate hour", error as object);
         }
+    }
+}
 
-        if (getGlobalOptions().json) {
-            printObject(res);
-        } else {
-            const data = [
-                ['Doing:', res.categoryName ?? "Undefined"],
+function printHour(hour: ZHour, hourNum: number, day: ZDay, timezone: string) {
+    const data = [
+        [hour.categoryName + ".", hour.categoryDesc ?? "Nothing stored yet."],
 
-            ];
-            if (res.comment) {
-                data.push(['Comment:', res.comment ?? "Undefined"]);
-            }
-            console.log(table(data, {
-                // border: getBorderCharacters("ramac"),
-                // singleLine: true,
-                // spanningCells: [{ col: 0, row: 0, colSpan: 2 },],
-                header: { alignment: "center", content: `${format(res.date, "EEEE, MMMM dd")} at ${getHourFromTime(res.time, true)}` },
-                drawVerticalLine: (lineIndex, columnCount) => {
-                    return lineIndex === 0 || lineIndex === columnCount || (lineIndex === 0 && columnCount === 2);
-                },
-                drawHorizontalLine: (lineIndex, rowCount) => {
-                    return (lineIndex < 2 || lineIndex === 2 || lineIndex === rowCount);
-                },
-            }));
-        }
-    });
+    ];
+    if (hour.comment) {
+        data.push(['Comment:', hour.comment]);
+    }
+    console.log(table(data, {
+        // border: getBorderCharacters("ramac"),
+        // singleLine: true,
+        columns: [{ width: 10 }, { width: 40 }],
+        header: { alignment: "center", content: `${spacetime(day.date, timezone).format('{day}, {month-short} {date-ordinal}')} at ${getHourFromTime(hourNum, 'all', timezones[timezone])}` },
+        drawVerticalLine: (lineIndex, columnCount) => {
+            return lineIndex === 0 || lineIndex === columnCount || (lineIndex === 0 && columnCount === 2);
+        },
+        drawHorizontalLine: (lineIndex, rowCount) => {
+            return (lineIndex < 2 || lineIndex === 2 || lineIndex === rowCount);
+        },
+    }));
+}
\ No newline at end of file
diff --git a/apps/web/components/dashboard/sidebar/TimezoneDisplay.tsx b/apps/web/components/dashboard/sidebar/TimezoneDisplay.tsx
index 2138a31..9f21fcd 100644
--- a/apps/web/components/dashboard/sidebar/TimezoneDisplay.tsx
+++ b/apps/web/components/dashboard/sidebar/TimezoneDisplay.tsx
@@ -3,7 +3,7 @@ import { useState, useEffect, use, } from "react";
 import Link from "next/link";
 import { format } from "date-fns";
 import { TZDate } from "@date-fns/tz";
-import { timezones } from '@/lib/timezones';
+import { timezones } from '@lifetracker/shared/utils/timezones';
 import { useTimezone } from "@lifetracker/shared-react/hooks/timezones";
 import LoadingSpinner from "@/components/ui/spinner";
 import { db } from "@lifetracker/db";
diff --git a/packages/db/schema.ts b/packages/db/schema.ts
index fc7e3a9..815f7f4 100644
--- a/packages/db/schema.ts
+++ b/packages/db/schema.ts
@@ -147,7 +147,7 @@ export const hours = sqliteTable(
             .notNull()
             .references(() => users.id, { onDelete: "cascade" }),
         comment: text("comment"),
-        time: integer("time"),
+        time: integer("time").notNull(),
         dayId: text("dayId").notNull().references(() => days.id, { onDelete: "cascade" }),
         categoryId: text("categoryId").references(() => categories.id),
     },
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 8052b6e..99af45a 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -8,6 +8,7 @@
     "@date-fns/tz": "^1.2.0",
     "@date-fns/utc": "^2.1.0",
     "date-fns": "^4.1.0",
+    "spacetime": "^7.6.2",
     "winston": "^3.17.0",
     "zod": "^3.23.8"
   },
diff --git a/packages/shared/types/days.ts b/packages/shared/types/days.ts
index fb247d5..4b637a8 100644
--- a/packages/shared/types/days.ts
+++ b/packages/shared/types/days.ts
@@ -6,9 +6,11 @@ export const zHourSchema = z.object({
     dayId: z.string(),
     date: z.string().optional(),
     time: z.number(),
+    datetime: z.string().optional(),
     categoryCode: z.coerce.number().nullish(),
     categoryId: z.string().nullish(),
     categoryName: z.string().nullish(),
+    categoryDesc: z.string().nullish(),
     comment: z.string().nullish(),
 });
 export type ZHour = z.infer<typeof zHourSchema>;
diff --git a/packages/shared/utils/days.ts b/packages/shared/utils/days.ts
index a54d3fd..0d38650 100644
--- a/packages/shared/utils/days.ts
+++ b/packages/shared/utils/days.ts
@@ -1,12 +1,16 @@
 import { format, addHours } from "date-fns";
 import { TZDate } from "@date-fns/tz";
 import { UTCDate, utc } from "@date-fns/utc";
+import spacetime from "spacetime";
 
 export function dateFromInput(input: { dateQuery: string, timezone: string }) {
+    console.log(`Looking for ${input.dateQuery} in ${input.timezone}`);
+
+
     let t: string;
     if (input.dateQuery == "today") {
-        t = new Date();
-        return format(t, "yyyy-MM-dd", { in: input.timezone });
+        t = spacetime(input.dateQuery, input.timezone).format("yyyy-MM-dd");
+        return t;
     }
     else {
         t = new UTCDate(input.dateQuery);
@@ -17,16 +21,18 @@ export function dateFromInput(input: { dateQuery: string, timezone: string }) {
 
 function generateHour(d, t) {
     const dt: TZDate = addHours(d, t);
+    console.log(dt);
     return {
         date: format(dt, 'yyyy-MM-dd'),
         time: parseInt(format(dt, 'H')),
     };
 }
 
-export function hoursListInTimezone(input: { dateQuery: string, timezone: string }) {
-    const dateStr = dateFromInput(input);
-    const d = new TZDate(dateStr, input.timezone);
-    return Array.from({ length: 24 }, (_, t) =>
-        generateHour(d, t)
-    );
+export function hoursListInUTC(input: { dateQuery: string, timezone: string }) {
+    const midnight = spacetime(input.dateQuery, input.timezone).time('00:00');
+    const hours = Array.from({ length: 24 }, function (_, i) {
+        const utcMoment = midnight.add(i, 'hour').goto('UTC');
+        return { date: utcMoment.format('hh'), time: utcMoment.hour() };
+    });
+    return hours;
 }
diff --git a/packages/shared/utils/hours.ts b/packages/shared/utils/hours.ts
index f8a3ce4..aeed7dc 100644
--- a/packages/shared/utils/hours.ts
+++ b/packages/shared/utils/hours.ts
@@ -1,7 +1,18 @@
-export function getHourFromTime(time: number, includePeriod = false) {
+
+
+export function getHourFromTime(time: number, includePeriod: 'none' | 'twelves' | 'all' = 'none', displayTZ = "") {
     const hour = time == 0 || time == 12 ? 12 : time % 12;
     const period = time < 12 ? "AM" : "PM";
-    return includePeriod ? `${hour} ${period}` : `${hour}`;
+    switch (includePeriod) {
+        case 'none':
+            return `${hour}`;
+        case 'twelves':
+            return hour === 12 ? `${hour} ${period}` : `${hour}`;
+        case 'all':
+            return `${hour} ${period}`;
+        default:
+            throw new Error("Invalid includePeriod option. Use either 'none', 'twelves', or 'all'");
+    }
 }
 
 export function getTimeFromHour(hour: string) {
@@ -13,9 +24,9 @@ export function getTimeFromHour(hour: string) {
     let time = parseInt(match[1]);
     const period = match[2] ? match[2].toUpperCase() : null;
 
-    if (time > 12 || time < 1) {
-        throw new Error("Invalid hour");
-    }
+    // if (time > 12 || time < 0) {
+    //     throw new Error("Invalid hour");
+    // }
 
     if (period === 'PM' && time !== 12) {
         time += 12;
diff --git a/apps/web/lib/timezones.ts b/packages/shared/utils/timezones.ts
similarity index 100%
rename from apps/web/lib/timezones.ts
rename to packages/shared/utils/timezones.ts
diff --git a/packages/trpc/routers/days.ts b/packages/trpc/routers/days.ts
index 43e8353..a545c55 100644
--- a/packages/trpc/routers/days.ts
+++ b/packages/trpc/routers/days.ts
@@ -9,7 +9,7 @@ import {
 } from "@lifetracker/shared/types/days";
 import type { Context } from "../index";
 import { authedProcedure, router } from "../index";
-import { dateFromInput, hoursListInTimezone } from "@lifetracker/shared/utils/days";
+import { dateFromInput, hoursListInUTC } from "@lifetracker/shared/utils/days";
 import { closestIndexTo, format } from "date-fns";
 import { TZDate } from "@date-fns/tz";
 import { hoursAppRouter } from "./hours";
@@ -106,17 +106,18 @@ export const daysAppRouter = router({
     get: authedProcedure
         .input(z.object({
             dateQuery: z.string(),
+            timezone: z.string().optional(),
         }))
         .output(zDaySchema)
         .query(async ({ input, ctx }) => {
 
-            const timezone = await getTimezone(ctx);
+            const timezone = input.timezone ?? await getTimezone(ctx);
             const date = dateFromInput({
                 dateQuery: input.dateQuery,
                 timezone: timezone
             });
 
-            const allHours = hoursListInTimezone({
+            const allHours = hoursListInUTC({
                 timezone,
                 ...input
             });
@@ -131,21 +132,43 @@ export const daysAppRouter = router({
                 }
             }));
 
-            const dayHours = await Promise.all(allHours.map(async function ({ date, time }) {
-                const dayId = allDayIds.find((_value: { id, date }) => date == date)!.id;
+            const dayHours = await Promise.all(allHours.map(async function (map: { date, time }) {
+                const dayId = allDayIds.find((dayIds: { id, date }) => map.date == dayIds.date)!.id;
 
-
-                const hourMatch = await ctx.db.select().from(hours)
+                const hourMatch = await ctx.db.select({
+                    id: hours.id,
+                    dayId: hours.dayId,
+                    time: hours.time,
+                    categoryId: hours.categoryId,
+                    categoryCode: categories.code,
+                    categoryName: categories.name,
+                    categoryDesc: categories.description,
+                    comment: hours.comment,
+                }).from(hours)
+                    .leftJoin(categories, eq(categories.id, hours.categoryId))
                     .where(and(
-                        eq(hours.time, time),
+                        eq(hours.time, map.time),
                         eq(hours.dayId, dayId)));
-
-                // console.log("Search values:: ", `d: ${date}, t: ${time}, dayId: ${dayId}`)
+                // console.log({
+                // ...allHours,
+                // dayId: dayId
+                // });
+                // console.log("Search values:: ", `allDayIds: ${allDayIds}, d: ${date}, t: ${time}, dayId: ${dayId}`)
                 // console.log("hourMatch", hourMatch[0]);
 
-                return hourMatch;
+                const dayHour = {
+                    ...hourMatch[0],
+
+                };
+
+                return {
+                    ...dayHour,
+                    date: map.date,
+                };
             }));
 
+            // console.log(dayHours.flat());
+
             return {
                 ...await getDay(input, ctx, date),
                 hours: dayHours.flat(),
@@ -158,10 +181,11 @@ export const daysAppRouter = router({
                 mood: z.string().optional().or(z.number()),
                 comment: z.string().optional(),
                 dateQuery: z.string(),
+                timezone: z.string().optional(),
             }),
         )
         .mutation(async ({ input, ctx }) => {
-            const { dateQuery, ...updatedProps } = input;
+            const { dateQuery, timezone, ...updatedProps } = input;
 
             // Convert mood to number, if it exists
             if (updatedProps.mood) {
@@ -170,6 +194,6 @@ export const daysAppRouter = router({
             await ctx.db
                 .update(days)
                 .set(updatedProps)
-                .where(eq(days.date, dateFromInput({ dateQuery: dateQuery, timezone: ctx.user.timezone })));
+                .where(eq(days.date, dateFromInput({ dateQuery: dateQuery, timezone: timezone ?? ctx.user.timezone })));
         }),
 });
diff --git a/packages/trpc/routers/hours.ts b/packages/trpc/routers/hours.ts
index 8991278..9dfdf48 100644
--- a/packages/trpc/routers/hours.ts
+++ b/packages/trpc/routers/hours.ts
@@ -50,23 +50,29 @@ export const hoursAppRouter = router({
                 comment: z.string().nullable().optional(),
             }),
         )
-        // .output(zHourSchema)
+        .output(zHourSchema)
         .mutation(async ({ input, ctx }) => {
             const { dateQuery, time, code, ...updatedProps } = input;
             var date = dateFromInput({ dateQuery: dateQuery });
-            const category = await ctx.db.select(
-                {
-                    id: categories.id,
-                    name: categories.name,
-                }
-            )
-                .from(categories)
-                .where(
-                    and(
-                        eq(categories.code, code),
-                        eq(categories.userId, ctx.user!.id),
+
+            const category =
+                code == "" ? [{
+                    id: null,
+                    name: null
+                }]
+                    : await ctx.db.select(
+                        {
+                            id: categories.id,
+                            name: categories.name,
+                        }
                     )
-                );
+                        .from(categories)
+                        .where(
+                            and(
+                                eq(categories.code, code),
+                                eq(categories.userId, ctx.user!.id),
+                            )
+                        );
 
 
             const day = await ctx.db.select(
@@ -82,6 +88,7 @@ export const hoursAppRouter = router({
 
             const newProps = {
                 categoryId: category[0].id,
+                code: code,
                 ...updatedProps
             };
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 28a39da..c91408a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,9 +41,15 @@ importers:
       dotenv:
         specifier: ^16.4.1
         version: 16.4.5
+      spacetime:
+        specifier: ^7.6.2
+        version: 7.6.2
       table:
         specifier: ^6.8.2
         version: 6.8.2
+      timezone-soft:
+        specifier: ^1.5.2
+        version: 1.5.2
       vite-tsconfig-paths:
         specifier: ^5.1.0
         version: 5.1.0(typescript@5.6.3)(vite@5.4.10(@types/node@20.11.24)(lightningcss@1.28.1)(terser@5.34.1))
@@ -490,6 +496,9 @@ importers:
       date-fns:
         specifier: ^4.1.0
         version: 4.1.0
+      spacetime:
+        specifier: ^7.6.2
+        version: 7.6.2
       winston:
         specifier: ^3.17.0
         version: 3.17.0