diff --git a/src/components/Event/Event.tsx b/src/components/Event/Event.tsx
index 5ddd3eb..56c3926 100644
--- a/src/components/Event/Event.tsx
+++ b/src/components/Event/Event.tsx
@@ -6,7 +6,7 @@ import {
 } from '../api';
 import { green, lightgrey } from '../colors';
 import { useMe } from '../hooks';
-import { IEventSignup } from '../types';
+import { IEvent, IEventSignup } from '../types';
 import UIButton from '../UI/UIButton';
 import UIPlacesAutocomplete from '../UI/UIPlacesAutocomplete';
 import UISecondaryBox from '../UI/UISecondaryBox';
@@ -16,17 +16,6 @@ import EventCarpools from './EventCarpools';
 import EventDetails from './EventDetails';
 import EventSignups from './EventSignups';
 
-export type IEvent = {
-	id: number;
-	name: string;
-	group: string;
-	formattedAddress: string;
-	startTime: string;
-	endTime: string;
-	latitude: number;
-	longitude: number;
-};
-
 function GroupName({ name }: { name: string }) {
 	return <span style={{ color: '#303030', textAlign: 'center' }}>{name}</span>;
 }
@@ -108,7 +97,7 @@ export default function Event({ event }: { event: IEvent }) {
 	return (
 		<UISecondaryBox>
 			<UISecondaryHeader>{name}</UISecondaryHeader>
-			<GroupName name={group} />
+			<GroupName name={group.name} />
 			<EventDetails {...{ startTime, endTime, formattedAddress }} />
 			<UIButton
 				onClick={toggleInterestedThrottled}
diff --git a/src/components/Event/EventCarpools.tsx b/src/components/Event/EventCarpools.tsx
index ac80ea6..2309730 100644
--- a/src/components/Event/EventCarpools.tsx
+++ b/src/components/Event/EventCarpools.tsx
@@ -1,14 +1,11 @@
 // import CallMergeIcon from '@material-ui/icons/CallMerge';
 import EmojiPeopleIcon from '@material-ui/icons/EmojiPeople';
-import { useCallback } from 'react';
-// import ScheduleIcon from '@material-ui/icons/Schedule';
-import { useState } from 'react';
+import { useCallback, useState } from 'react';
 import { createCarpool } from '../api';
 import { lightgrey } from '../colors';
 import { useMe } from '../hooks';
-import { ICarpool } from '../types';
+import { ICarpool, IEvent } from '../types';
 import UIButton from '../UI/UIButton';
-import { IEvent } from './Event';
 
 function CarpoolRow({ carpool }: { carpool: ICarpool }) {
 	const PADDING = '1rem';
diff --git a/src/components/Event/EventDetails.tsx b/src/components/Event/EventDetails.tsx
index 246487a..1e13d6e 100644
--- a/src/components/Event/EventDetails.tsx
+++ b/src/components/Event/EventDetails.tsx
@@ -8,7 +8,7 @@ export default function Details({
 	formattedAddress,
 }: {
 	startTime: string;
-	endTime: string;
+	endTime: string | null;
 	formattedAddress: string;
 }) {
 	return (
@@ -27,7 +27,9 @@ export default function Details({
 				}}
 			>
 				<EventIcon style={{ marginRight: '1rem' }} />
-				{formatStartAndEndTime(startTime, endTime)}
+				{endTime
+					? formatStartAndEndTime(startTime, endTime)
+					: new Date(startTime).toLocaleString()}
 			</div>
 			<br />
 			<div
diff --git a/src/components/Event/EventSignups.tsx b/src/components/Event/EventSignups.tsx
index 77f8ddb..77d45ff 100644
--- a/src/components/Event/EventSignups.tsx
+++ b/src/components/Event/EventSignups.tsx
@@ -1,9 +1,8 @@
 import PersonAddIcon from '@material-ui/icons/PersonAdd';
 import { useMe } from '../hooks';
 import latlongdist, { R_miles } from '../latlongdist';
-import { IEventSignup } from '../types';
+import { IEventSignup, IEvent } from '../types';
 import usePlace from '../usePlace';
-import { IEvent } from './Event';
 
 export default function EventSignups({
 	event,
diff --git a/src/components/EventStream.tsx b/src/components/EventStream.tsx
index 9fc94ae..c394463 100644
--- a/src/components/EventStream.tsx
+++ b/src/components/EventStream.tsx
@@ -1,4 +1,5 @@
-import Event, { IEvent } from './Event/Event';
+import Event from './Event/Event';
+import { IEvent } from './types';
 
 export default function EventStream({ events }: { events: IEvent[] }) {
 	return (
diff --git a/src/components/Events.tsx b/src/components/Events.tsx
index 3fe11da..14d027c 100644
--- a/src/components/Events.tsx
+++ b/src/components/Events.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { getEvents } from './api';
-import { IEvent } from './Event/Event';
+import { IEvent } from './types';
 import EventStream from './EventStream';
 
 export default function Events() {
diff --git a/src/components/Group.tsx b/src/components/Group.tsx
index 779369e..e120fe8 100644
--- a/src/components/Group.tsx
+++ b/src/components/Group.tsx
@@ -2,10 +2,10 @@ import { useEffect, useState } from 'react';
 import { useParams } from 'react-router';
 import { Link } from 'react-router-dom';
 import { getGroup, getGroupEvents } from './api';
-import { IEvent } from './Event/Event';
 import EventCreatorLink from './EventCreator/EventCreatorLink';
 import EventStream from './EventStream';
 import GroupSettingsLink from './GroupSettings/GroupSettingsLink';
+import { IEvent } from './types';
 import UILink from './UI/UILink';
 
 export type IGroup = {
diff --git a/src/components/types.ts b/src/components/types.ts
index 81068a2..9cee24a 100644
--- a/src/components/types.ts
+++ b/src/components/types.ts
@@ -53,9 +53,13 @@ export type IEvent = {
 	id: number;
 	name: string;
 	groupId: number;
-	startTime: Date;
+	group: {
+		id: number;
+		name: string;
+	};
+	startTime: string; // Datestring
 	duration: number;
-	endTime: Date | null;
+	endTime: string | null; // Datestring
 	daysOfWeek: number;
 	placeId: string;
 	formattedAddress: string;