diff --git a/assets/css/_trip-plan-results.scss b/assets/css/_trip-plan-results.scss
index 9075b24534..bfa87176f9 100644
--- a/assets/css/_trip-plan-results.scss
+++ b/assets/css/_trip-plan-results.scss
@@ -30,6 +30,20 @@
     }
   }
 
+  &-tag {
+    background-color: $brand-primary-darkest;
+    border-radius: 0 0 8px;
+    color: $white;
+    font-weight: bold;
+    grid-column-end: 3;
+    grid-column-start: 1;
+    margin-bottom: 1rem;
+    margin-left: -1rem;
+    margin-top: -1rem;
+    padding: .5rem 1rem;
+    width: fit-content;
+  }
+
   /* stylelint-disable property-no-vendor-prefix */
   &-header {
     background-color: $brand-primary-lightest-contrast;
@@ -37,7 +51,7 @@
     border-bottom: 0;
     display: -ms-grid;
     display: grid;
-    -ms-grid-columns: 1fr 1fr;
+    -ms-grid-columns: 1fr 1fr 1fr;
     grid-template-columns: 1fr 1fr;
     line-height: 1.5;
     margin-top: 0;
diff --git a/assets/css/_utilities.scss b/assets/css/_utilities.scss
index 65a423992e..601a3d3ba4 100644
--- a/assets/css/_utilities.scss
+++ b/assets/css/_utilities.scss
@@ -267,6 +267,10 @@
   margin-top: 0 !important;
 }
 
+.mt-05 {
+  margin-top: calc(#{$base-spacing} / 2) !important;
+}
+
 .mt-1 {
   margin-top: $base-spacing !important;
 }
diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss
index c7ccdbb245..9af231f723 100644
--- a/assets/css/_variables.scss
+++ b/assets/css/_variables.scss
@@ -151,6 +151,8 @@ $gray-stripe-pattern: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAA
 $form-check-margin-bottom: $base-spacing-sm;
 $form-check-input-gutter: $base-spacing;
 $form-check-input-margin-y: 0;
+$input-border-color: $brand-primary;
+$input-btn-border-width: 2px;
 
 // Font-awesome settings
 $fa-font-path: '/fonts';
diff --git a/assets/react_app.js b/assets/react_app.js
index 5d347eb6d6..8c638ea428 100644
--- a/assets/react_app.js
+++ b/assets/react_app.js
@@ -5,7 +5,6 @@ import readline from "readline";
 import TransitNearMe from "../assets/ts/tnm/components/TransitNearMe";
 import AdditionalLineInfo from "../assets/ts/schedule/components/AdditionalLineInfo";
 import ScheduleFinder from "../assets/ts/schedule/components/ScheduleFinder";
-import TripPlannerResults from "../assets/ts/trip-plan-results/components/TripPlannerResults";
 import ProjectsPage from "../assets/ts/projects/components/ProjectsPage";
 import LiveCrowdingIcon from "./ts/schedule/components/line-diagram/LiveCrowdingIcon";
 
@@ -56,7 +55,6 @@ const Components = {
   ScheduleFinder,
   AdditionalLineInfo,
   TransitNearMe,
-  TripPlannerResults,
   ProjectsPage,
   LiveCrowdingIcon
 };
diff --git a/assets/ts/components/Feedback.tsx b/assets/ts/components/Feedback.tsx
deleted file mode 100644
index 6a06b48dcc..0000000000
--- a/assets/ts/components/Feedback.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { ReactElement } from "react";
-
-const Feedback = (): ReactElement<HTMLElement> => {
-  const url =
-    /* istanbul ignore next */
-    typeof document !== "undefined"
-      ? `/customer-support?comments=${document.title}`
-      : `/customer-support`;
-  return (
-    <div className="c-feedback">
-      <h3>Feedback</h3>
-      Please report issues with cleanliness, signage, and any other concerns you
-      may have. We will do our best to address the issues as soon as possible.
-      <a href={url} className="btn btn-secondary c-feedback__button">
-        Contact us
-      </a>
-    </div>
-  );
-};
-
-export default Feedback;
diff --git a/assets/ts/components/FeedbackForm.tsx b/assets/ts/components/FeedbackForm.tsx
new file mode 100644
index 0000000000..c990326490
--- /dev/null
+++ b/assets/ts/components/FeedbackForm.tsx
@@ -0,0 +1,190 @@
+import { uniqueId } from "lodash";
+import React, {
+  ChangeEvent,
+  ReactElement,
+  useEffect,
+  useRef,
+  useState
+} from "react";
+import renderFa from "../helpers/render-fa";
+
+interface VoteButtonProps {
+  upOrDown: "up" | "down";
+  ariaLabel: string;
+  onPress: Function;
+  isActive?: boolean;
+}
+const VoteButton = ({
+  upOrDown,
+  ariaLabel,
+  onPress,
+  isActive = false
+}: VoteButtonProps): ReactElement<HTMLButtonElement> => {
+  return (
+    <button
+      type="button"
+      className="btn btn-sm btn-link"
+      aria-pressed={isActive}
+      aria-label={ariaLabel}
+      onClick={() => onPress()}
+    >
+      {renderFa(
+        "",
+        `fa-${isActive ? "solid" : "regular"} fa-thumbs-${upOrDown}`,
+        true
+      )}
+    </button>
+  );
+};
+
+const sendFormData = (
+  formEl: HTMLFormElement | null,
+  callback: Function
+): void => {
+  if (!formEl) return;
+  const formData = new FormData(formEl);
+  const formJson = Object.fromEntries(formData.entries());
+  callback(formJson);
+};
+
+interface FeedbackFormProps {
+  promptText: string;
+  upLabel: string;
+  downLabel: string;
+  commentPromptText: string;
+  commentLabel: string;
+  commentPlaceholder: string;
+  formDataCallback: (formData: Record<string, string>) => void;
+}
+/**
+ * A compact form featuring upvote/downvote button, optional comment submission,
+ * and invocation of a callback function on submit
+ */
+const FeedbackForm = ({
+  promptText,
+  upLabel,
+  downLabel,
+  commentPromptText,
+  commentLabel,
+  commentPlaceholder,
+  formDataCallback
+}: FeedbackFormProps): ReactElement<HTMLElement> => {
+  const [showComment, setShowComment] = useState(false);
+  const [showConfirmation, setShowConfirmation] = useState(false);
+  const [vote, setVote] = useState<"up" | "down" | null>(null);
+  const [hasComment, setHasComment] = useState(false);
+
+  const upVote = (): void => {
+    setVote(v => (v === "up" ? null : "up"));
+    setShowComment(false);
+  };
+  const downVote = (): void => setVote(v => (v === "down" ? null : "down"));
+  const showCommentPrompt = vote === "down";
+  const toggleComment = (): void => {
+    setShowComment(show => !show);
+  };
+  const handleTextAreaChange = (
+    event: ChangeEvent<HTMLTextAreaElement>
+  ): void => {
+    const {
+      target: { value }
+    } = event;
+    setHasComment(!!value && value !== "");
+  };
+
+  const formRef = useRef<HTMLFormElement>(null);
+
+  useEffect(() => {
+    sendFormData(formRef.current, formDataCallback);
+  }, [vote, formDataCallback]);
+
+  if (showConfirmation)
+    return (
+      <p>
+        Your feedback has been submitted. Thanks for helping us improve the
+        website!
+      </p>
+    );
+
+  const commentId = uniqueId();
+  return (
+    <form
+      ref={formRef}
+      aria-label="feedback"
+      method="post"
+      onSubmit={(event: React.SyntheticEvent<HTMLFormElement>) => {
+        event.preventDefault();
+        sendFormData(event.currentTarget, formDataCallback);
+        setShowComment(false);
+        setShowConfirmation(true);
+      }}
+    >
+      <div className="d-inline me-8">
+        {vote === null ? promptText : "Thanks for your response!"}
+      </div>
+      <div className="btn-group">
+        <input type="hidden" name="feedback_vote" value={vote || ""} />
+        <VoteButton
+          ariaLabel={upLabel}
+          upOrDown="up"
+          onPress={upVote}
+          isActive={vote === "up"}
+        />
+        <VoteButton
+          ariaLabel={downLabel}
+          upOrDown="down"
+          onPress={downVote}
+          isActive={vote === "down"}
+        />
+      </div>
+      <span aria-live="assertive">
+        {showCommentPrompt && (
+          <button
+            type="button"
+            className="btn btn-sm btn-link"
+            style={{ border: 0, paddingInline: "0rem" }}
+            aria-controls={commentId}
+            aria-expanded={showComment}
+            aria-pressed={showComment}
+            onClick={toggleComment}
+          >
+            {commentPromptText}
+          </button>
+        )}
+      </span>
+      {showComment && (
+        <div id={commentId} className="mt-05">
+          <div className="form-group">
+            <label className="w-100">
+              <strong>{commentLabel}</strong>
+              <textarea
+                name="feedback_long"
+                className="form-control"
+                rows={2}
+                maxLength={1000}
+                placeholder={commentPlaceholder}
+                onChange={handleTextAreaChange}
+              />
+            </label>
+          </div>
+          <button
+            className="btn btn-sm btn-primary"
+            type="submit"
+            disabled={!hasComment}
+          >
+            Submit
+          </button>
+          <button
+            className="btn btn-sm btn-link"
+            type="button"
+            onClick={() => setShowComment(false)}
+          >
+            Cancel
+          </button>
+        </div>
+      )}
+    </form>
+  );
+};
+
+export default FeedbackForm;
diff --git a/assets/ts/components/__tests__/FeedbackFormTest.tsx b/assets/ts/components/__tests__/FeedbackFormTest.tsx
new file mode 100644
index 0000000000..50830ee063
--- /dev/null
+++ b/assets/ts/components/__tests__/FeedbackFormTest.tsx
@@ -0,0 +1,135 @@
+import React from "react";
+import { render, screen, fireEvent, waitFor } from "@testing-library/react";
+import FeedbackForm from "../FeedbackForm";
+
+const promptText = "Do you enjoy this component?";
+const upLabel = "Love it";
+const downLabel = "Hate it";
+const commentPromptText = "Tell us how you really feel";
+const commentLabel = "What do you mean by that";
+const commentPlaceholder = "Be as descriptive as necessary";
+describe("FeedbackForm", () => {
+  beforeEach(() => {
+    render(
+      <FeedbackForm
+        promptText={promptText}
+        upLabel={upLabel}
+        downLabel={downLabel}
+        commentPromptText={commentPromptText}
+        commentLabel={commentLabel}
+        commentPlaceholder={commentPlaceholder}
+        formDataCallback={jest.fn()}
+      />
+    );
+  });
+
+  test("upvotes", () => {
+    expect(screen.getByRole("form")).toHaveFormValues({ feedback_vote: "" });
+    const upBtn = screen.getByRole("button", { name: "Love it" });
+    expect(screen.getByText(promptText)).toBeInTheDocument();
+    upBtn.click();
+    expect(screen.queryByText(promptText)).toBeNull();
+    expect(screen.getByText("Thanks for your response!")).toBeInTheDocument();
+    expect(screen.getByRole("form")).toHaveFormValues({ feedback_vote: "up" });
+  });
+
+  test("downvotes", () => {
+    expect(screen.getByRole("form")).toHaveFormValues({ feedback_vote: "" });
+    const downBtn = screen.getByRole("button", { name: "Hate it" });
+    expect(screen.getByText(promptText)).toBeInTheDocument();
+    downBtn.click();
+    expect(screen.queryByText(promptText)).toBeNull();
+    expect(screen.getByText("Thanks for your response!")).toBeInTheDocument();
+    expect(screen.getByRole("form")).toHaveFormValues({
+      feedback_vote: "down"
+    });
+  });
+
+  test("switches votes", () => {
+    expect(screen.getByRole("form")).toHaveFormValues({ feedback_vote: "" });
+    screen.getByRole("button", { name: "Love it" }).click();
+    expect(screen.getByRole("form")).toHaveFormValues({ feedback_vote: "up" });
+    screen.getByRole("button", { name: "Hate it" }).click();
+    expect(screen.getByRole("form")).toHaveFormValues({
+      feedback_vote: "down"
+    });
+  });
+
+  test("toggles vote", () => {
+    [
+      ["Love it", "up"],
+      ["Hate it", "down"]
+    ].forEach(([name, expectedValue]) => {
+      expect(screen.getByRole("form")).toHaveFormValues({ feedback_vote: "" });
+      const voteBtn = screen.getByRole("button", { name });
+      voteBtn.click();
+      expect(screen.getByRole("form")).toHaveFormValues({
+        feedback_vote: expectedValue
+      });
+      voteBtn.click();
+      expect(screen.getByRole("form")).toHaveFormValues({ feedback_vote: "" });
+    });
+  });
+
+  test("shows a textbox on downvote + confirm", () => {
+    const downBtn = screen.getByRole("button", { name: "Hate it" });
+    expect(screen.queryByText(commentPromptText)).not.toBeInTheDocument();
+    expect(screen.queryByRole("textbox")).not.toBeInTheDocument();
+
+    downBtn.click();
+    expect(screen.queryByText(commentPromptText)).toBeInTheDocument();
+    expect(screen.queryByRole("textbox")).not.toBeInTheDocument();
+
+    screen.queryByText(commentPromptText)?.click();
+    expect(screen.queryByRole("textbox")).toBeInTheDocument();
+  });
+
+  test("cancels the comment", () => {
+    const downBtn = screen.getByRole("button", { name: "Hate it" });
+    downBtn.click();
+    screen.queryByText(commentPromptText)?.click();
+    const commentBox = screen.getByRole("textbox");
+    fireEvent.change(commentBox, {
+      target: { value: "This comment won't be submitted" }
+    });
+    screen.getByText("Cancel").click();
+    expect(commentBox).not.toBeInTheDocument();
+    // selected button is still pressed
+    expect(
+      screen.getByRole("button", { name: "Hate it", pressed: true })
+    ).toBeInTheDocument();
+  });
+});
+
+test("FeedbackForm invokes callback on submit", async () => {
+  let cbSpy = jest.fn();
+  render(
+    <FeedbackForm
+      promptText={""}
+      upLabel={""}
+      downLabel={"Down"}
+      commentPromptText={"Say more"}
+      commentLabel={"Soapbox"}
+      commentPlaceholder={""}
+      formDataCallback={cbSpy}
+    />
+  );
+
+  screen.getByRole("button", { name: "Down" }).click();
+  await waitFor(() => {
+    expect(cbSpy).toHaveBeenLastCalledWith({
+      feedback_vote: "down"
+    });
+  });
+
+  screen.getByText("Say more").click();
+  const commentBox = screen.getByRole("textbox");
+  fireEvent.change(commentBox, { target: { value: "some text" } });
+  screen.getByText("Submit").click();
+  await waitFor(() => {
+    expect(cbSpy).toHaveBeenLastCalledWith({
+      feedback_long: "some text",
+      feedback_vote: "down"
+    });
+  });
+});
diff --git a/assets/ts/components/__tests__/FeedbackTest.tsx b/assets/ts/components/__tests__/FeedbackTest.tsx
deleted file mode 100644
index 012b38b8ee..0000000000
--- a/assets/ts/components/__tests__/FeedbackTest.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-import renderer from "react-test-renderer";
-import Feedback from "../Feedback";
-import { createReactRoot } from "../../app/helpers/testUtils";
-
-test("it renders", () => {
-  createReactRoot();
-  document.title = "Some title";
-
-  const tree = renderer.create(<Feedback />).toJSON();
-  expect(tree).toMatchSnapshot();
-});
diff --git a/assets/ts/components/__tests__/__snapshots__/FeedbackTest.tsx.snap b/assets/ts/components/__tests__/__snapshots__/FeedbackTest.tsx.snap
deleted file mode 100644
index 973dda1e28..0000000000
--- a/assets/ts/components/__tests__/__snapshots__/FeedbackTest.tsx.snap
+++ /dev/null
@@ -1,18 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`it renders 1`] = `
-<div
-  className="c-feedback"
->
-  <h3>
-    Feedback
-  </h3>
-  Please report issues with cleanliness, signage, and any other concerns you may have. We will do our best to address the issues as soon as possible.
-  <a
-    className="btn btn-secondary c-feedback__button"
-    href="/customer-support?comments=Some title"
-  >
-    Contact us
-  </a>
-</div>
-`;
diff --git a/assets/ts/trip-plan-results/__tests__/TripPlannerResultsTest.tsx b/assets/ts/trip-plan-results/__tests__/TripPlannerResultsTest.tsx
index d3eceebd68..396206916e 100644
--- a/assets/ts/trip-plan-results/__tests__/TripPlannerResultsTest.tsx
+++ b/assets/ts/trip-plan-results/__tests__/TripPlannerResultsTest.tsx
@@ -1,8 +1,6 @@
 import React from "react";
-import renderer, { act } from "react-test-renderer";
-import { createReactRoot } from "../../app/helpers/testUtils";
+import { render, screen } from "@testing-library/react";
 import TripPlannerResults from "../components/TripPlannerResults";
-import Accordion, { AccordionNoJS } from "../../components/Accordion";
 import { TileServerUrl } from "../../leaflet/components/__mapdata";
 
 const html = "<div>Lots of content about the itinerary</div>";
@@ -34,44 +32,49 @@ const map = {
   ]
 };
 
-it("it renders", () => {
-  createReactRoot();
-  const tree = renderer.create(
-    <TripPlannerResults
-      itineraryData={[
-        {
-          html,
-          access_html,
-          fares_estimate_html,
-          tab_html,
-          fare_calculator_html,
-          id: 1,
-          map
-        }
-      ]}
-    />
-  );
-  tree.update(
-    <TripPlannerResults
-      itineraryData={[
-        {
-          html,
-          access_html,
-          fares_estimate_html,
-          tab_html,
-          fare_calculator_html,
-          id: 1,
-          map
-        }
-      ]}
-    />
+test("TripPlannerResults shows a number of itineraries", () => {
+  const itineraryData = [
+    {
+      html,
+      access_html,
+      fares_estimate_html,
+      tab_html,
+      fare_calculator_html,
+      id: 1,
+      map,
+      tag: "best"
+    },
+    {
+      html,
+      access_html,
+      fares_estimate_html,
+      tab_html,
+      fare_calculator_html,
+      id: 2,
+      map,
+      tag: null
+    },
+    {
+      html,
+      access_html,
+      fares_estimate_html,
+      tab_html,
+      fare_calculator_html,
+      id: 3,
+      map,
+      tag: null
+    }
+  ];
+  const { container } = render(
+    <TripPlannerResults itineraryData={itineraryData} metadata={{}} />
   );
-  expect(tree.toJSON()).toMatchSnapshot();
+  expect(
+    container.querySelectorAll(".m-trip-plan-results__itinerary")
+  ).toHaveLength(itineraryData.length);
 });
 
 it("it renders ItineraryBody when clicking to expand", () => {
-  createReactRoot();
-  const tree = renderer.create(
+  render(
     <TripPlannerResults
       itineraryData={[
         {
@@ -81,22 +84,16 @@ it("it renders ItineraryBody when clicking to expand", () => {
           tab_html,
           fare_calculator_html,
           id: 1,
-          map
+          map,
+          tag: null
         }
       ]}
+      metadata={{}}
     />
   );
 
-  const button = tree.root.findAllByType("button")[0];
-
-  act(button.props.onClick);
-
-  expect(tree.root.findAllByType(Accordion).length).toBe(2);
-  expect(tree.root.findAllByType(AccordionNoJS).length).toBe(2);
-
+  screen.getByRole("button", { name: "Show map and trip details" }).click();
   expect(
-    tree.root.findAllByProps({
-      html: "<div>Lots of content about the itinerary</div>"
-    }).length
-  ).toBe(2);
+    screen.getByText("Lots of content about the itinerary")
+  ).toBeInTheDocument();
 });
diff --git a/assets/ts/trip-plan-results/__tests__/__snapshots__/TripPlannerResultsTest.tsx.snap b/assets/ts/trip-plan-results/__tests__/__snapshots__/TripPlannerResultsTest.tsx.snap
deleted file mode 100644
index e8be89f720..0000000000
--- a/assets/ts/trip-plan-results/__tests__/__snapshots__/TripPlannerResultsTest.tsx.snap
+++ /dev/null
@@ -1,177 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`it renders 1`] = `
-<div
-  className="m-trip-plan-results__itinerary"
->
-  <div
-    className="m-trip-plan-results__itinerary-header"
-  >
-    <div
-      className="m-trip-plan-results__itinerary-header-content"
-    >
-      <div
-        className="m-trip-plan-results__itinerary-summary"
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "<div>HTML for the accordion button</div>",
-          }
-        }
-      />
-      <div
-        className="m-trip-plan-results__itinerary-accessible"
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "<div>Accessible</div>",
-          }
-        }
-      />
-    </div>
-    <div
-      className="m-trip-plan-results__itinerary-fares"
-      dangerouslySetInnerHTML={
-        Object {
-          "__html": "<div>HTML content for fares</div>",
-        }
-      }
-    />
-  </div>
-  <div
-    className="c-accordion-ui"
-  >
-    <div
-      className="panel"
-    >
-      <div
-        aria-level={3}
-        className="c-accordion-ui__heading"
-        role="heading"
-      >
-        <button
-          aria-controls="itinerary-1-section"
-          aria-expanded={false}
-          className="c-accordion-ui__trigger collapsed"
-          onClick={[Function]}
-          type="button"
-        >
-          <span
-            className="c-accordion-ui__title"
-            id="itinerary-1-title"
-          >
-            Show map and trip details
-          </span>
-          <div
-            className="c-accordion-ui__indicator"
-          >
-            <span
-              className="c-indicator__content c-indicator__content--angle"
-            />
-          </div>
-        </button>
-      </div>
-      <div
-        aria-labelledby="itinerary-1-title"
-        className="c-accordion-ui__target js-focus-on-expand"
-        id="itinerary-1-section"
-        role="region"
-      />
-    </div>
-  </div>
-  <noscript>
-    <div
-      className="c-accordion-ui"
-    >
-      <div
-        aria-labelledby="itinerary-1-title"
-        className="c-accordion-ui__target"
-        id="itinerary-1-section"
-        role="region"
-      >
-        <div
-          className="c-accordion-ui__content"
-        >
-          <div
-            className="m-trip-plan-results__itinerary-body"
-          >
-            <div
-              className="trip-plan-map map"
-            />
-            <div
-              dangerouslySetInnerHTML={
-                Object {
-                  "__html": "<div>Lots of content about the itinerary</div>",
-                }
-              }
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </noscript>
-  <div
-    className="c-accordion-ui"
-  >
-    <div
-      className="panel"
-    >
-      <div
-        aria-level={3}
-        className="c-accordion-ui__heading"
-        role="heading"
-      >
-        <button
-          aria-controls="itinerary-1-fare-calculator-section"
-          aria-expanded={false}
-          className="c-accordion-ui__trigger collapsed"
-          onClick={[Function]}
-          type="button"
-        >
-          <span
-            className="c-accordion-ui__title"
-            id="itinerary-1-fare-calculator-title"
-          >
-            Show fare calculator
-          </span>
-          <div
-            className="c-accordion-ui__indicator"
-          >
-            <span
-              className="c-indicator__content c-indicator__content--angle"
-            />
-          </div>
-        </button>
-      </div>
-      <div
-        aria-labelledby="itinerary-1-fare-calculator-title"
-        className="c-accordion-ui__target js-focus-on-expand"
-        id="itinerary-1-fare-calculator-section"
-        role="region"
-      />
-    </div>
-  </div>
-  <noscript>
-    <div
-      className="c-accordion-ui"
-    >
-      <div
-        aria-labelledby="itinerary-1-fare-calculator-title"
-        className="c-accordion-ui__target"
-        id="itinerary-1-fare-calculator-section"
-        role="region"
-      >
-        <div
-          className="c-accordion-ui__content"
-        >
-          <div
-            dangerouslySetInnerHTML={
-              Object {
-                "__html": "<div>HTML content for fare calculator</div>",
-              }
-            }
-          />
-        </div>
-      </div>
-    </div>
-  </noscript>
-</div>
-`;
diff --git a/assets/ts/trip-plan-results/components/Itinerary.tsx b/assets/ts/trip-plan-results/components/Itinerary.tsx
index 9edf3b8dfd..063b2911ab 100644
--- a/assets/ts/trip-plan-results/components/Itinerary.tsx
+++ b/assets/ts/trip-plan-results/components/Itinerary.tsx
@@ -6,6 +6,7 @@ import {
   addAlertItemEventHandlers,
   removeAlertItemEventHandlers
 } from "../../../js/alert-item";
+import FeedbackForm from "../../components/FeedbackForm";
 
 /*
 The following ignored functions are vanilla JS event handlers
@@ -45,6 +46,7 @@ export const removeToggleAlertHandlers = (): void => {
 
 interface Props {
   itinerary: Itinerary;
+  feedbackCallback: (formData: Record<string, string>) => void;
 }
 
 const ItineraryBody = (itinerary: Itinerary): ReactElement<HTMLElement> => {
@@ -71,10 +73,16 @@ const ItineraryBody = (itinerary: Itinerary): ReactElement<HTMLElement> => {
 };
 
 const ItineraryAccordion = ({
-  itinerary
+  itinerary,
+  feedbackCallback
 }: Props): ReactElement<HTMLElement> => (
   <div className="m-trip-plan-results__itinerary">
     <div className="m-trip-plan-results__itinerary-header">
+      {itinerary.tag && (
+        <div className="m-trip-plan-results__itinerary-tag u-small-caps">
+          {itinerary.tag}
+        </div>
+      )}
       <div className="m-trip-plan-results__itinerary-header-content">
         <div
           className="m-trip-plan-results__itinerary-summary"
@@ -89,6 +97,18 @@ const ItineraryAccordion = ({
         className="m-trip-plan-results__itinerary-fares"
         dangerouslySetInnerHTML={{ __html: itinerary.fares_estimate_html }} // eslint-disable-line react/no-danger
       />
+      <div style={{ gridColumn: "1 / -1" }}>
+        <hr />
+        <FeedbackForm
+          promptText="Is this trip plan helpful?"
+          upLabel="Yes, it is helpful"
+          downLabel="No, it is not helpful"
+          commentPromptText="Share more details"
+          commentLabel="Why is this trip plan not helpful?"
+          commentPlaceholder="Ex. too many transfers, would take too long, etc."
+          formDataCallback={feedbackCallback}
+        />
+      </div>
     </div>
     <Accordion
       id={`itinerary-${itinerary.id}`}
diff --git a/assets/ts/trip-plan-results/components/TripPlannerResults.tsx b/assets/ts/trip-plan-results/components/TripPlannerResults.tsx
index 3a94ed553d..939f7fb0c4 100644
--- a/assets/ts/trip-plan-results/components/TripPlannerResults.tsx
+++ b/assets/ts/trip-plan-results/components/TripPlannerResults.tsx
@@ -5,6 +5,7 @@ import Itinerary from "./Itinerary";
 export interface Itinerary {
   id: number;
   html: string;
+  tag: string | null;
   // eslint-disable-next-line
   map: MapData;
   tab_html: string;
@@ -14,16 +15,39 @@ export interface Itinerary {
 }
 
 interface Props {
-  // eslint-disable-next-line
   itineraryData: Itinerary[];
+  metadata: Record<string, unknown>;
+}
+
+function recordResponse(
+  formData: Record<string, string>,
+  metadata: Record<string, unknown>,
+  id: number
+): void {
+  const data = Object.assign({ itinerary_index: id }, metadata, formData);
+  const method = formData.feedback_vote === "" ? "DELETE" : "POST";
+  fetch("/trip-planner/feedback", {
+    method,
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(data)
+  });
 }
 
 const TripPlannerResults = ({
-  itineraryData
+  itineraryData,
+  metadata
 }: Props): ReactElement<HTMLElement> => (
   <>
     {itineraryData.map(itinerary => (
-      <Itinerary key={itinerary.id} itinerary={itinerary} />
+      <Itinerary
+        key={itinerary.id}
+        itinerary={itinerary}
+        feedbackCallback={formData => {
+          recordResponse(formData, metadata, itinerary.id);
+        }}
+      />
     ))}
   </>
 );
diff --git a/assets/ts/trip-plan-results/trip-plan-results-loader.tsx b/assets/ts/trip-plan-results/trip-plan-results-loader.tsx
index 405021be2e..b4444b4e5c 100644
--- a/assets/ts/trip-plan-results/trip-plan-results-loader.tsx
+++ b/assets/ts/trip-plan-results/trip-plan-results-loader.tsx
@@ -7,10 +7,13 @@ const render = (): void => {
   if (!itinDataEl) return;
   const rootEl = document.getElementById("react-root");
   rootEl!.innerHTML = ""; // purge server rendered content
-  const itineraryData = JSON.parse(itinDataEl.innerHTML)
-    .itineraryData as Itinerary[];
+  const data = JSON.parse(itinDataEl.innerHTML);
+  const itineraryData = data.itineraryData as Itinerary[];
   ReactDOM.render(
-    <TripPlannerResults itineraryData={itineraryData} />,
+    <TripPlannerResults
+      itineraryData={itineraryData}
+      metadata={data.metadata}
+    />,
     document.getElementById("react-root")
   );
 };
diff --git a/assets/tsconfig.json b/assets/tsconfig.json
index f2862bdb59..52ccb69c78 100644
--- a/assets/tsconfig.json
+++ b/assets/tsconfig.json
@@ -22,7 +22,8 @@
     // This fixes an issue with @types/core-js, see thread https://github.com/DefinitelyTyped/DefinitelyTyped/issues/15140 -  MH
     "lib": [
       "es2017",
-      "dom"
+      "dom",
+      "dom.iterable"
     ],
     /* Strict Type-Checking Options */
     "strict": true, /* Enable all strict type-checking options. */
diff --git a/config/config.exs b/config/config.exs
index 04436a50a5..3141ac44ca 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -5,3 +5,5 @@ config :elixir, ansi_enabled: true
 for config_file <- Path.wildcard("config/{deps,dotcom}/*.exs") do
   import_config("../#{config_file}")
 end
+
+import_config "#{config_env()}.exs"
diff --git a/config/deps/deps.exs b/config/deps/deps.exs
index 05c0d7888f..0ff127e192 100644
--- a/config/deps/deps.exs
+++ b/config/deps/deps.exs
@@ -22,3 +22,6 @@ if config_env() == :test do
     ],
     js_errors: true
 end
+
+config :open_trip_planner_client,
+  timezone: "America/New_York"
diff --git a/config/dev.exs b/config/dev.exs
new file mode 100644
index 0000000000..becde76932
--- /dev/null
+++ b/config/dev.exs
@@ -0,0 +1 @@
+import Config
diff --git a/config/dotcom/cms.exs b/config/dotcom/cms.exs
index 7c70bd9d49..2f06d6514d 100644
--- a/config/dotcom/cms.exs
+++ b/config/dotcom/cms.exs
@@ -14,5 +14,5 @@ if config_env() == :test do
 
   config :dotcom, :cms_api, CMS.API.Static
 
-  config :dotcom, :cms_cache, CMS.TestCache
+  config :dotcom, :cms_cache, Dotcom.Cache.TestCache
 end
diff --git a/config/dotcom/dotcom.exs b/config/dotcom/dotcom.exs
index a253dd7323..bcaf9aa2dd 100644
--- a/config/dotcom/dotcom.exs
+++ b/config/dotcom/dotcom.exs
@@ -41,3 +41,5 @@ config :dotcom, :route_patterns_repo_api, repo_module
 predictions_broadcast_interval_ms = if config_env() == :test, do: 50, else: 10_000
 
 config :dotcom, predictions_broadcast_interval_ms: predictions_broadcast_interval_ms
+
+config :dotcom, :trip_plan_feedback_cache, Dotcom.Cache.TripPlanFeedback.Cache
diff --git a/config/dotcom/trip_planner.exs b/config/dotcom/trip_planner.exs
index 59633a378e..8281ce7995 100644
--- a/config/dotcom/trip_planner.exs
+++ b/config/dotcom/trip_planner.exs
@@ -1,11 +1,9 @@
 import Config
 
-config :dotcom, TripPlanApi, module: TripPlan.Api.OpenTripPlanner
-
 config :dotcom, TripPlanGeocode, module: TripPlan.Geocode
 
 if config_env() == :test do
-  config :dotcom, TripPlanApi, module: TripPlan.Api.MockPlanner
+  config :dotcom, :trip_planner, OpenTripPlannerClient.Mock
 
   config :dotcom, TripPlanGeocode, module: TripPlan.Geocode.MockGeocode
 end
diff --git a/config/prod.exs b/config/prod.exs
new file mode 100644
index 0000000000..becde76932
--- /dev/null
+++ b/config/prod.exs
@@ -0,0 +1 @@
+import Config
diff --git a/config/runtime.exs b/config/runtime.exs
index 9f8aa94f09..3449ed91ce 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -64,7 +64,7 @@ if config_env() == :dev do
   end
 end
 
-config :dotcom, CMS.Cache,
+redis_config = [
   mode: :redis_cluster,
   redis_cluster: [
     configuration_endpoints: [
@@ -76,6 +76,10 @@ config :dotcom, CMS.Cache,
   ],
   stats: true,
   telemetry: true
+]
+
+config :dotcom, CMS.Cache, redis_config
+config :dotcom, Dotcom.Cache.TripPlanFeedback.Cache, redis_config
 
 if config_env() == :test do
   config :dotcom, DotcomWeb.Router,
@@ -118,6 +122,11 @@ config :dotcom, OpenTripPlanner,
   wiremock_proxy: System.get_env("WIREMOCK_PROXY", "false"),
   wiremock_proxy_url: System.get_env("WIREMOCK_TRIP_PLAN_PROXY_URL")
 
+if config_env() != :test and System.get_env("OPEN_TRIP_PLANNER_URL") != "" do
+  config :open_trip_planner_client,
+    otp_url: System.get_env("OPEN_TRIP_PLANNER_URL")
+end
+
 if config_env() != :test do
   config :dotcom,
     drupal: [
diff --git a/config/test.exs b/config/test.exs
new file mode 100644
index 0000000000..0572e3511c
--- /dev/null
+++ b/config/test.exs
@@ -0,0 +1,3 @@
+import Config
+
+config :dotcom, :trip_plan_feedback_cache, Dotcom.Cache.TestCache
diff --git a/lib/dotcom/application.ex b/lib/dotcom/application.ex
index af080fa3f7..e94b79f8b4 100644
--- a/lib/dotcom/application.ex
+++ b/lib/dotcom/application.ex
@@ -42,6 +42,7 @@ defmodule Dotcom.Application do
         },
         RepoCache.Log,
         {Application.get_env(:dotcom, :cms_cache, CMS.Cache), []},
+        Dotcom.Cache.TripPlanFeedback.Cache,
         CMS.Telemetry,
         V3Api.Cache,
         Schedules.Repo,
diff --git a/lib/dotcom/cache/trip_plan_feedback/cache.ex b/lib/dotcom/cache/trip_plan_feedback/cache.ex
new file mode 100644
index 0000000000..3727b52100
--- /dev/null
+++ b/lib/dotcom/cache/trip_plan_feedback/cache.ex
@@ -0,0 +1,5 @@
+defmodule Dotcom.Cache.TripPlanFeedback.Cache do
+  use Nebulex.Cache,
+    otp_app: :dotcom,
+    adapter: NebulexRedisAdapter
+end
diff --git a/lib/dotcom/cache/trip_plan_feedback/key_generator.ex b/lib/dotcom/cache/trip_plan_feedback/key_generator.ex
new file mode 100644
index 0000000000..bc5ade97d6
--- /dev/null
+++ b/lib/dotcom/cache/trip_plan_feedback/key_generator.ex
@@ -0,0 +1,31 @@
+defmodule Dotcom.Cache.TripPlanFeedback.KeyGenerator do
+  @moduledoc """
+  Generate a readable cache key which includes details to identify a unique trip
+  planner itinerary feedback form.
+  """
+  @behaviour Nebulex.Caching.KeyGenerator
+
+  @impl Nebulex.Caching.KeyGenerator
+  def generate(mod, _fun, [
+        %{
+          "itinerary_index" => itinerary_index,
+          "generated_user_id" => generated_user_id,
+          "generated_time" => generated_time
+        }
+      ]) do
+    "#{clean_mod(mod)}|#{env_name()}|#{generated_user_id}|#{generated_time}|#{itinerary_index}"
+  end
+
+  defp env_name do
+    System.get_env("SENTRY_ENVIRONMENT", "local")
+  end
+
+  defp clean_mod(mod) do
+    mod
+    |> Kernel.to_string()
+    |> String.split(".")
+    |> (fn [_ | tail] -> tail end).()
+    |> Enum.join(".")
+    |> String.downcase()
+  end
+end
diff --git a/lib/dotcom/trip_plan/merge.ex b/lib/dotcom/trip_plan/merge.ex
deleted file mode 100644
index cc00f83ee3..0000000000
--- a/lib/dotcom/trip_plan/merge.ex
+++ /dev/null
@@ -1,142 +0,0 @@
-defmodule Dotcom.TripPlan.Merge do
-  @moduledoc false
-
-  @doc """
-  Merges a list of accessible itineraries with unknown ones, preferring the
-  unknown itineraries but including at least two from each list.
-
-  See `merge/4` for more documentation about how we pull from the two lists.
-  """
-  @spec merge_itineraries(itinerary_list, itinerary_list) :: itinerary_list
-        when itinerary_list: [TripPlan.Itinerary.t()]
-  def merge_itineraries(accessible, unknown) do
-    merge(
-      accessible,
-      unknown,
-      &TripPlan.Itinerary.same_itinerary?/2,
-      needed_accessible: 2,
-      needed_unknown: 2
-    )
-  end
-
-  @doc """
-  Merges two sets of lists, requiring items from the accessible list but
-  preferring items from the unknown list. Takes as an argument a function
-  which returns true if two items from the lists are equal.
-
-  The reason for the preference is that we assume that a better itinerary
-  would be in the unknown list as well as the accessible one. If it only
-  appears in the accessible list, it's worse than the itineraries in the
-  unknown list.
-
-  ## Examples
-
-  We'll return values from the accessible list as long as they're equal to items
-  in the unknown list (the function is comparing the atoms):
-
-      iex> merge([a: true, b: true, d: true], [a: false, b: false, c: false],
-      ...> fn {accessible, _}, {unknown, _} -> accessible == unknown end)
-      [a: true, b: true, c: false]
-
-  If the top items are not equal, we'll still return at least one item from
-  the accessible list:
-
-      iex> merge([d: true, e: true, f: true], [a: false, b: false, c: false],
-      ...> fn {a, _}, {u, _} -> a == u end)
-      [a: false, b: false, d: true]
-
-  If given a different total number of items, or items needed from the accessible
-  list, we'll use those values instead of the defaults of 1 item from the
-  accessible list and 3 total:
-
-      iex> merge([d: true, e: true, f: true], [a: false, b: false, c: false],
-      ...> fn {a, _}, {u, _} -> a == u end,
-      ...> needed_accessible: 2, total: 4)
-      [a: false, b: false, d: true, e: true]
-
-  We can also ask for more of each list than the total: in that case we'll
-  get more items:
-
-      iex> merge([d: true, e: true, f: true], [a: false, b: false, c: false],
-      ...> fn {a, _}, {u, _} -> a == u end,
-      ...> needed_accessible: 2, needed_unknown: 2)
-      [a: false, b: false, d: true, e: true]
-
-  ...but we won't if we can get all we need with the total:
-
-      iex> merge([a: true, b: true, d: true], [a: false, b: false, c: false],
-      ...> fn {accessible, _}, {unknown, _} -> accessible == unknown end,
-      ...> needed_accessible: 2, needed_unknown: 2)
-      [a: true, b: true, c: false]
-  """
-  @spec merge([a], [a], (a, a -> boolean), Keyword.t()) :: [a]
-        when a: term
-  def merge(accessible, unknown, equal_fn, opts \\ []) do
-    needed_accessible = Keyword.get(opts, :needed_accessible, 1)
-    needed_unknown = Keyword.get(opts, :needed_unknown, 1)
-    total = Keyword.get(opts, :total, 3)
-
-    state = %{
-      equal_fn: equal_fn,
-      accessible: needed_accessible,
-      unknown: needed_unknown,
-      total: total
-    }
-
-    do_merge(accessible, unknown, state)
-  end
-
-  defp do_merge(_, _, %{total: total}) when total <= 0 do
-    []
-  end
-
-  defp do_merge(accessible, [], %{total: total}) do
-    Enum.take(accessible, total)
-  end
-
-  defp do_merge([], unknown, %{total: total}) do
-    Enum.take(unknown, total)
-  end
-
-  defp do_merge(accessible, unknown, %{
-         accessible: acc,
-         unknown: unk,
-         total: total,
-         equal_fn: equal_fn
-       })
-       when total == acc or total == unk do
-    # if we need all the rest, take them, but not less than 0 items
-    unk = max(unk, 0)
-    acc = max(acc, 0)
-    unknown = Enum.take(unknown, unk)
-    accessible = Enum.take(accessible, acc)
-
-    merge(
-      accessible,
-      unknown,
-      equal_fn,
-      total: unk + acc,
-      needed_accessible: 0,
-      needed_unknown: 0
-    )
-  end
-
-  defp do_merge([a | a_rest] = a_all, [u | u_rest], state) do
-    %{
-      equal_fn: equal_fn,
-      accessible: acc,
-      unknown: unk,
-      total: total
-    } = state
-
-    # we have a trip from the accessible list, so we take both heads if they're equal
-    if equal_fn.(a, u) do
-      state = Map.merge(state, %{accessible: acc - 1, unknown: unk - 1, total: total - 1})
-      [a | do_merge(a_rest, u_rest, state)]
-    else
-      # we take one from unknown, and still need the same from the accessible list
-      state = Map.merge(state, %{unknown: unk - 1, total: total - 1})
-      [u | do_merge(a_all, u_rest, state)]
-    end
-  end
-end
diff --git a/lib/dotcom/trip_plan/query.ex b/lib/dotcom/trip_plan/query.ex
index d7d1a9b054..1dffce5be0 100644
--- a/lib/dotcom/trip_plan/query.ex
+++ b/lib/dotcom/trip_plan/query.ex
@@ -1,6 +1,13 @@
 defmodule Dotcom.TripPlan.Query do
   @moduledoc "Fetch trip plan via OTP and handle response"
 
+  alias OpenTripPlannerClient.ItineraryTag.{
+    EarliestArrival,
+    LeastWalking,
+    MostDirect,
+    ShortestTrip
+  }
+
   alias TripPlan.{Itinerary, NamedPosition}
 
   defstruct [
@@ -9,9 +16,41 @@ defmodule Dotcom.TripPlan.Query do
     :itineraries,
     errors: MapSet.new(),
     time: :unknown,
-    wheelchair_accessible?: false
+    wheelchair: false
   ]
 
+  defimpl Jason.Encoder, for: __MODULE__ do
+    @keys_to_encode [
+      :from,
+      :errors,
+      :itineraries,
+      :time,
+      :to,
+      :wheelchair
+    ]
+
+    def encode(value, opts) do
+      value
+      |> Map.take(@keys_to_encode)
+      |> Enum.flat_map(&encode_value/1)
+      |> Enum.into(%{})
+      |> Jason.Encode.map(opts)
+    end
+
+    defp encode_value({:time, {type, %DateTime{} = dt}}) do
+      [{"time_type", type}, {"date_time", dt}]
+    end
+
+    defp encode_value({:errors, mapset}), do: [{"errors", MapSet.to_list(mapset)}]
+    defp encode_value({:itineraries, {:error, _}}), do: []
+    defp encode_value({:itineraries, {:ok, itineraries}}), do: [{"itineraries", itineraries}]
+    defp encode_value(values), do: [values]
+  end
+
+  @otp_depart_at_tags [EarliestArrival, MostDirect, LeastWalking]
+  @otp_arrive_by_tags [ShortestTrip, MostDirect, LeastWalking]
+
+  @type query_itineraries :: {:ok, [Itinerary.t()]} | {:error, any()}
   @type position_error :: TripPlan.Geocode.error() | :same_address
   @type position :: NamedPosition.t() | {:error, position_error} | nil
   @type t :: %__MODULE__{
@@ -19,19 +58,20 @@ defmodule Dotcom.TripPlan.Query do
           to: position,
           time: :unknown | Dotcom.TripPlan.DateTime.date_time(),
           errors: MapSet.t(atom),
-          wheelchair_accessible?: boolean,
-          itineraries: TripPlan.Api.t() | nil
+          wheelchair: boolean,
+          itineraries: query_itineraries() | nil
         }
 
-  @spec from_query(map, TripPlan.Api.connection_opts(), Keyword.t()) :: t
-  def from_query(params, connection_opts, date_opts) do
+  @spec from_query(map, Keyword.t()) :: t
+  def from_query(params, date_opts) do
     opts = get_query_options(params)
 
-    %__MODULE__{}
+    %__MODULE__{
+      wheelchair: match?(%{"wheelchair" => "true"}, params)
+    }
     |> Dotcom.TripPlan.DateTime.validate(params, date_opts)
     |> Dotcom.TripPlan.Location.validate(params)
-    |> include_options(opts)
-    |> maybe_fetch_itineraries(connection_opts, opts)
+    |> maybe_fetch_itineraries(opts)
   end
 
   @spec get_query_options(map) :: keyword()
@@ -42,56 +82,47 @@ defmodule Dotcom.TripPlan.Query do
     |> opts_from_query
   end
 
-  @spec maybe_fetch_itineraries(t, TripPlan.Api.connection_opts(), Keyword.t()) :: t
+  @spec maybe_fetch_itineraries(t, Keyword.t()) :: t
   defp maybe_fetch_itineraries(
          %__MODULE__{
            to: %NamedPosition{},
            from: %NamedPosition{}
          } = query,
-         connection_opts,
          opts
        ) do
     if Enum.empty?(query.errors) do
       query
-      |> fetch_itineraries(connection_opts, [query.time | opts])
+      |> fetch_itineraries([query.time | opts])
       |> parse_itinerary_result(query)
     else
       query
     end
   end
 
-  defp maybe_fetch_itineraries(%__MODULE__{} = query, _conn_opts, _opts) do
+  defp maybe_fetch_itineraries(%__MODULE__{} = query, _opts) do
     query
   end
 
-  @spec fetch_itineraries(t, TripPlan.Api.connection_opts(), Keyword.t()) :: TripPlan.Api.t()
+  @spec fetch_itineraries(t, Keyword.t()) :: OpenTripPlannerClient.Behaviour.plan()
   defp fetch_itineraries(
          %__MODULE__{from: %NamedPosition{} = from, to: %NamedPosition{} = to},
-         connection_opts,
          opts
        ) do
-    pid = self()
+    opts =
+      Keyword.put_new(
+        opts,
+        :tags,
+        if Keyword.has_key?(opts, :arrive_by) do
+          @otp_arrive_by_tags
+        else
+          @otp_depart_at_tags
+        end
+      )
 
-    if Keyword.get(opts, :wheelchair_accessible?) do
-      TripPlan.plan(from, to, connection_opts, opts)
-    else
-      accessible_opts = Keyword.put(opts, :wheelchair_accessible?, true)
-
-      [mixed_results, accessible_results] =
-        Util.async_with_timeout(
-          [
-            fn -> TripPlan.plan(from, to, connection_opts, opts, pid) end,
-            fn -> TripPlan.plan(from, to, connection_opts, accessible_opts, pid) end
-          ],
-          {:error, :timeout},
-          __MODULE__
-        )
-
-      dedup_itineraries(mixed_results, accessible_results)
-    end
+    TripPlan.Api.OpenTripPlanner.plan(from, to, opts)
   end
 
-  @spec parse_itinerary_result(TripPlan.Api.t(), t) :: t
+  @spec parse_itinerary_result(OpenTripPlannerClient.Behaviour.plan(), t) :: t
   defp parse_itinerary_result({:ok, _} = result, %__MODULE__{} = query) do
     %{query | itineraries: result}
   end
@@ -102,34 +133,7 @@ defmodule Dotcom.TripPlan.Query do
     |> Map.put(:errors, MapSet.put(query.errors, error))
   end
 
-  @spec dedup_itineraries(TripPlan.Api.t(), TripPlan.Api.t()) :: TripPlan.Api.t()
-  defp dedup_itineraries({:error, _status} = response, {:error, _accessible_response}),
-    do: response
-
-  defp dedup_itineraries(unknown, {:error, _response}), do: unknown
-  defp dedup_itineraries({:error, _response}, {:ok, _itineraries} = accessible), do: accessible
-
-  defp dedup_itineraries({:ok, unknown}, {:ok, accessible}) do
-    merged =
-      Dotcom.TripPlan.Merge.merge_itineraries(
-        accessible,
-        unknown
-      )
-
-    {:ok, merged}
-  end
-
   defp set_default_options(params) do
-    params
-    |> default_optimize_for
-    |> default_mode
-  end
-
-  def default_optimize_for(params) do
-    Map.put(params, "optimize_for", "best_route")
-  end
-
-  def default_mode(params) do
     Map.put(params, "modes", %{
       "bus" => "true",
       "commuter_rail" => "true",
@@ -138,30 +142,22 @@ defmodule Dotcom.TripPlan.Query do
     })
   end
 
-  defp include_options(%__MODULE__{} = query, opts) do
-    %{query | wheelchair_accessible?: opts[:wheelchair_accessible?] == true}
-  end
-
   @spec opts_from_query(map, Keyword.t()) :: Keyword.t()
   def opts_from_query(query, opts \\ [])
 
-  def opts_from_query(%{"optimize_for" => val} = query, opts) do
-    # We have seen some rare sentry errors where the page anchor can
-    # get appended to the optimize_for value, so we preemptively
-    # strip it here.
-    val =
-      val
-      |> String.split("#")
-      |> List.first()
-      |> optimize_for(opts)
-
-    opts_from_query(Map.delete(query, "optimize_for"), val)
+  def opts_from_query(%{"wheelchair" => "true"} = query, opts) do
+    opts_from_query(
+      Map.delete(query, "wheelchair"),
+      Keyword.put(opts, :wheelchair, true)
+    )
   end
 
   def opts_from_query(%{"modes" => modes} = query, opts) do
+    active_modes = Enum.reduce(modes, [], &get_active_modes/2)
+
     opts_from_query(
       Map.delete(query, "modes"),
-      get_mode_opts(modes, opts)
+      Keyword.put(opts, :mode, active_modes)
     )
   end
 
@@ -176,12 +172,6 @@ defmodule Dotcom.TripPlan.Query do
     opts
   end
 
-  @spec get_mode_opts(map, Keyword.t()) :: Keyword.t()
-  def get_mode_opts(%{} = modes, opts) do
-    active_modes = Enum.reduce(modes, [], &get_active_modes/2)
-    Keyword.put(opts, :mode, active_modes)
-  end
-
   @spec get_active_modes({String.t(), String.t()}, Keyword.t()) :: Keyword.t()
   defp get_active_modes({"subway", "true"}, acc) do
     ["TRAM", "SUBWAY" | acc]
@@ -203,28 +193,6 @@ defmodule Dotcom.TripPlan.Query do
     acc
   end
 
-  @spec optimize_for(String.t(), Keyword.t()) :: Keyword.t()
-  defp optimize_for("best_route", opts) do
-    opts
-  end
-
-  defp optimize_for("accessibility", opts) do
-    Keyword.put(opts, :wheelchair_accessible?, true)
-  end
-
-  defp optimize_for("fewest_transfers", opts) do
-    Keyword.put(opts, :optimize_for, :fewest_transfers)
-  end
-
-  defp optimize_for("less_walking", opts) do
-    Keyword.put(opts, :optimize_for, :less_walking)
-  end
-
-  # If the query has a typo for this value, just use "best_route"
-  defp optimize_for(_, opts) do
-    opts
-  end
-
   @doc "Determines if the given query contains any itineraries"
   @spec itineraries?(t | nil) :: boolean
   def itineraries?(%__MODULE__{itineraries: {:ok, itineraries}}) do
diff --git a/lib/dotcom_web/controllers/trip_plan/feedback.ex b/lib/dotcom_web/controllers/trip_plan/feedback.ex
new file mode 100644
index 0000000000..791548797c
--- /dev/null
+++ b/lib/dotcom_web/controllers/trip_plan/feedback.ex
@@ -0,0 +1,26 @@
+defmodule DotcomWeb.TripPlan.Feedback do
+  @moduledoc """
+  Handle submission of the feedback form given with each itinerary returned by
+  the trip planner. Saves to the Redis cache with the default TTL of :infinity.
+  """
+  use DotcomWeb, :controller
+  use Nebulex.Caching
+
+  alias Dotcom.Cache.TripPlanFeedback.KeyGenerator
+
+  @cache Application.compile_env!(:dotcom, :trip_plan_feedback_cache)
+
+  def delete(conn, params), do: cache_and_response(conn, params, :delete)
+  def put(conn, params), do: cache_and_response(conn, params, :put)
+
+  defp cache_and_response(conn, params, action) do
+    handle_cache(action, params)
+    send_resp(conn, 202, "")
+  end
+
+  @decorate cache_evict(cache: @cache, key_generator: KeyGenerator)
+  defp handle_cache(:delete, params), do: params
+
+  @decorate cache_put(cache: @cache, key_generator: KeyGenerator)
+  defp handle_cache(:put, params), do: params
+end
diff --git a/lib/dotcom_web/controllers/trip_plan_controller.ex b/lib/dotcom_web/controllers/trip_plan_controller.ex
index 2529dcd1fd..ad5f893c52 100644
--- a/lib/dotcom_web/controllers/trip_plan_controller.ex
+++ b/lib/dotcom_web/controllers/trip_plan_controller.ex
@@ -9,13 +9,12 @@ defmodule DotcomWeb.TripPlanController do
   alias Routes.Route
   alias Dotcom.TripPlan.{Query, RelatedLink, ItineraryRow, ItineraryRowList}
   alias Dotcom.TripPlan.Map, as: TripPlanMap
-  alias DotcomWeb.Plugs.Cookies
   alias TripPlan.{Itinerary, Leg, NamedPosition, PersonalDetail, TransitDetail, Transfer}
 
   plug(:assign_initial_map)
   plug(:breadcrumbs)
   plug(:modes)
-  plug(:optimize_for)
+  plug(:wheelchair)
   plug(:meta_description)
   plug(:assign_datetime_selector_fields)
 
@@ -240,20 +239,11 @@ defmodule DotcomWeb.TripPlanController do
     Enum.map(related_links, fn x -> Enum.uniq_by(x, fn y -> get_route(y) end) end)
   end
 
-  defp get_conn_opts(conn) do
-    user_id =
-      conn.cookies
-      |> Map.get(Cookies.id_cookie_name())
-
-    [user_id: user_id]
-  end
-
   @spec render_plan(Plug.Conn.t(), map) :: Plug.Conn.t()
-  defp render_plan(conn, plan) do
+  defp render_plan(conn, plan_params) do
     query =
       Query.from_query(
-        plan,
-        get_conn_opts(conn),
+        plan_params,
         now: conn.assigns.date_time,
         end_of_rating: Map.get(conn.assigns, :end_of_rating, Schedules.Repo.end_of_rating())
       )
@@ -266,7 +256,7 @@ defmodule DotcomWeb.TripPlanController do
 
     route_map = routes_for_query(itineraries)
     route_mapper = &Map.get(route_map, &1)
-    itinerary_row_lists = itinerary_row_lists(itineraries, route_mapper, plan)
+    itinerary_row_lists = itinerary_row_lists(itineraries, route_mapper, plan_params)
 
     conn
     |> render(
@@ -457,13 +447,14 @@ defmodule DotcomWeb.TripPlanController do
     assign(conn, :breadcrumbs, [Breadcrumb.build("Trip Planner")])
   end
 
-  @spec optimize_for(Plug.Conn.t(), Keyword.t()) :: Plug.Conn.t()
-  def optimize_for(%Plug.Conn{params: %{"plan" => %{"optimize_for" => val}}} = conn, _) do
-    assign(conn, :optimize_for, val)
+  @spec wheelchair(Plug.Conn.t(), Keyword.t()) :: Plug.Conn.t()
+  def wheelchair(%Plug.Conn{params: %{"plan" => plan_params}} = conn, _) do
+    assign(conn, :wheelchair, get_in(plan_params, ["wheelchair"]) === "true")
   end
 
-  def optimize_for(%Plug.Conn{} = conn, _) do
-    assign(conn, :optimize_for, "best_route")
+  # Initialize to checked state for trip plan accessibility
+  def wheelchair(%Plug.Conn{} = conn, _) do
+    assign(conn, :wheelchair, true)
   end
 
   @spec routes_for_query([Itinerary.t()]) :: route_map
diff --git a/lib/dotcom_web/router.ex b/lib/dotcom_web/router.ex
index 6e72f8c48e..2c3034c530 100644
--- a/lib/dotcom_web/router.ex
+++ b/lib/dotcom_web/router.ex
@@ -200,6 +200,8 @@ defmodule DotcomWeb.Router do
     get("/trip-planner/from/:address", TripPlanController, :from)
     get("/trip-planner/to/", Redirector, to: "/trip-planner")
     get("/trip-planner/to/:address", TripPlanController, :to)
+    delete("/trip-planner/feedback", TripPlan.Feedback, :delete)
+    post("/trip-planner/feedback", TripPlan.Feedback, :put)
     get("/customer-support", CustomerSupportController, :index)
     get("/customer-support/thanks", CustomerSupportController, :thanks)
     post("/customer-support", CustomerSupportController, :submit)
diff --git a/lib/dotcom_web/templates/trip_plan/_itinerary_tab.html.eex b/lib/dotcom_web/templates/trip_plan/_itinerary_tab.html.eex
index 4e6f00b7ba..c6c7cbae07 100644
--- a/lib/dotcom_web/templates/trip_plan/_itinerary_tab.html.eex
+++ b/lib/dotcom_web/templates/trip_plan/_itinerary_tab.html.eex
@@ -1,18 +1,17 @@
-<h2>Itinerary <%= @index %></h2>
 <div>
   <%= if @itinerary_row_list.alerts? do %>
     <span class="m-trip-plan-results__itinerary-alerts">
       <%= fa "exclamation-triangle" %>
     </span>
   <% end %>
-  <span class="m-trip-plan-results__itinerary-length-time">
+  <span class="m-trip-plan-results__itinerary-length-time h3">
     <%= Timex.format!(@itinerary.start, "{h12}:{m} {AM}") %> - <%= Timex.format!(@itinerary.stop, "{h12}:{m} {AM}") %>
   </span>
   <span class="m-trip-plan-results__itinerary-length-duration">
     <%= Timex.diff(@itinerary.stop, @itinerary.start, :minutes) |> format_minutes_duration %>
   </span>
 </div>
-<div class="m-trip-plan-results__itinerary-legs">
+<div class="m-trip-plan-results__itinerary-legs mt-05">
   <%= @routes |> Enum.map(&icon_for_route/1) |> Enum.intersperse(fa "angle-right") %>
   <span class="m-trip-plan-results__itinerary-length-distance">
     <%= svg "walk.svg" %>
diff --git a/lib/dotcom_web/templates/trip_plan/_more_options.html.eex b/lib/dotcom_web/templates/trip_plan/_more_options.html.eex
index 6b98b6d7d9..adf901978a 100644
--- a/lib/dotcom_web/templates/trip_plan/_more_options.html.eex
+++ b/lib/dotcom_web/templates/trip_plan/_more_options.html.eex
@@ -2,9 +2,15 @@
   <%=
     inputs_for(@form, :modes, [], fn mode_f ->
       for mode <- [:subway, :commuter_rail, :bus, :ferry] do
-        active? = Map.get(@modes, mode, true)
+        active? = if @modes === %{} do
+          # if no modes specified, just use all of them! this also reflects what
+          # OpenTripPlanner returns when no modes are specified.
+          true
+        else
+          Map.get(@modes, mode, false)
+        end
         content_tag(:div, [
-          checkbox(mode_f, mode, checked: active?, class: "c-checkbox__input"),
+          checkbox(mode_f, mode, checked: active?, class: "c-checkbox__input", hidden_input: false),
           label(mode_f, mode, class: "c-checkbox__label")
         ],
         class: "c-checkbox")
@@ -14,26 +20,11 @@
 </div>
 
 <div class="form-group m-trip-plan__optimize-for">
-  <%
-    radio_buttons = [
-      {"best_route", "Best route"},
-      {"accessibility", ["Wheelchair accessible", svg_icon_with_circle(%SvgIconWithCircle{icon: :access})]},
-      {"fewest_transfers", "Fewest transfers"},
-      {"less_walking", "Less walking"}
-    ]
-  %>
+  <%=
 
-  <fieldset>
-    <legend class="sr-only">Choose how to optimize your trip:</legend>
-    <%= for {val, text} <- radio_buttons do %>
-      <div class="form-check m-trip-plan__form-check">
-        <label class="form-check-label m-trip-plan__form-label" for="<%= val %>">
-          <%= radio_button @parent_form, :optimize_for, val, id: val, class: "form-check-input c-radio", checked: @optimize_for === val %>
-          <div class="c-radio__label">
-            <%= text %>
-          </div>
-        </label>
-      </div>
-    <% end %>
-  </fieldset>
+      content_tag(:div, [
+        checkbox(@form, :wheelchair, checked: @wheelchair == true, class: "c-checkbox__input", hidden_input: false),
+        label(@form, :wheelchair, ["Wheelchair accessible", svg_icon_with_circle(%SvgIconWithCircle{icon: :access})], class: "c-checkbox__label")
+      ], class: "c-checkbox")
+  %>
 </div>
diff --git a/lib/dotcom_web/templates/trip_plan/_sidebar.html.eex b/lib/dotcom_web/templates/trip_plan/_sidebar.html.eex
index 62eff10f72..cf37d47bc9 100644
--- a/lib/dotcom_web/templates/trip_plan/_sidebar.html.eex
+++ b/lib/dotcom_web/templates/trip_plan/_sidebar.html.eex
@@ -32,7 +32,7 @@
     <%= render "_mobile_trip_summary.html", query: query, itineraries?: itineraries? %>
     <%= form_for @conn, @conn.request_path<>"#plan_result_focus", form_options, fn f -> %>
       <%= render "_to_from_inputs.html", Map.merge(assigns, to_from_assigns)  %>
-      <%= render "_options.html", conn: @conn, parent_form: f, errors: plan_error, query: query, modes: @modes, optimize_for: @optimize_for, plan_datetime_selector_fields: @plan_datetime_selector_fields %>
+      <%= render "_options.html", conn: @conn, parent_form: f, errors: plan_error, query: query, modes: @modes, wheelchair: @wheelchair, plan_datetime_selector_fields: @plan_datetime_selector_fields %>
       <%= render "_submit_button.html" %>
       <div class="trip-plan__submit-container">
           <a href="/trip-planner" id="trip-plan__submit" type="submit" class="hidden-js btn btn-secondary hidden-print m-trip-plan__reset">Reset form</a>
diff --git a/lib/dotcom_web/templates/trip_plan/index.html.eex b/lib/dotcom_web/templates/trip_plan/index.html.eex
index ccca93a0ec..f29dfd85f4 100644
--- a/lib/dotcom_web/templates/trip_plan/index.html.eex
+++ b/lib/dotcom_web/templates/trip_plan/index.html.eex
@@ -12,10 +12,9 @@
           </p>
           <p class="instructions page-section"><%= itinerary_explanation(@query, @modes) %></p>
           <% itinerary_data = itinerary_html(@itineraries, %{conn: @conn, expanded: @expanded}) %>
-          <script id="js-tp-itinerary-data" type="text/plain"><%= raw(Poison.encode!(%{itineraryData: itinerary_data})) %></script>
-          <div id="react-root">
-              <%= unless Enum.empty?(@itineraries) do render_react(%{itineraryData: itinerary_data}) end %>
-          </div>
+          <% metadata = trip_plan_metadata(@conn) %>
+          <script id="js-tp-itinerary-data" type="text/plain"><%= raw(Jason.encode!(%{itineraryData: itinerary_data, metadata: metadata})) %></script>
+          <div id="react-root"></div>
           <%= if Application.get_env(:dotcom, :dev_server?) do %>
             <script defer src="<%= "#{Application.get_env(:dotcom, :webpack_path)}/tripplanresults.js" %>"></script>
           <% else %>
diff --git a/lib/dotcom_web/views/trip_plan_view.ex b/lib/dotcom_web/views/trip_plan_view.ex
index 12a958e179..1bd314792b 100644
--- a/lib/dotcom_web/views/trip_plan_view.ex
+++ b/lib/dotcom_web/views/trip_plan_view.ex
@@ -5,9 +5,9 @@ defmodule DotcomWeb.TripPlanView do
   alias Fares.{Fare, Format}
   alias Phoenix.{HTML}
   alias Routes.Route
-  alias Dotcom.React
   alias Dotcom.TripPlan.{ItineraryRow, Query}
   alias DotcomWeb.PartialView.SvgIconWithCircle
+  alias DotcomWeb.Plugs.Cookies
   alias TripPlan.{Itinerary, Leg, Transfer}
 
   import Schedules.Repo, only: [end_of_rating: 0]
@@ -42,11 +42,11 @@ defmodule DotcomWeb.TripPlanView do
     ]
   end
 
-  defp trip_explanation(%{wheelchair_accessible?: false}) do
+  defp trip_explanation(%{wheelchair: false}) do
     "Trips"
   end
 
-  defp trip_explanation(%{wheelchair_accessible?: true}) do
+  defp trip_explanation(%{wheelchair: true}) do
     "Wheelchair accessible trips"
   end
 
@@ -58,8 +58,7 @@ defmodule DotcomWeb.TripPlanView do
   def selected_modes_string(%{} = modes) do
     modes
     |> Enum.filter(fn {_, selected?} -> selected? end)
-    |> Enum.map(fn {key, _} -> key |> mode_name() |> String.downcase() end)
-    |> Enum.join(", ")
+    |> Enum.map_join(", ", fn {key, _} -> key |> mode_name() |> String.downcase() end)
   end
 
   defp time_explanation(%{time: {:arrive_by, _dt}}) do
@@ -311,6 +310,11 @@ defmodule DotcomWeb.TripPlanView do
   defp format_green_line_name("Green Line " <> branch), do: "Green Line (#{branch})"
 
   @spec accessibility_icon(TripPlan.Itinerary.t()) :: Phoenix.HTML.Safe.t()
+  defp accessibility_icon(%TripPlan.Itinerary{accessible?: nil}) do
+    # Unknown accessibilityScore, so can't show a value
+    {:safe, ""}
+  end
+
   defp accessibility_icon(%TripPlan.Itinerary{accessible?: accessible?}) do
     content_tag(
       :span,
@@ -515,6 +519,7 @@ defmodule DotcomWeb.TripPlanView do
         tab_html: tab_html,
         id: index,
         map: itinerary_map(map),
+        tag: tag_string(i.tag),
         access_html: access_html,
         fares_estimate_html: fares_estimate_html,
         fare_calculator_html: fare_calculator_html
@@ -522,21 +527,36 @@ defmodule DotcomWeb.TripPlanView do
     end
   end
 
-  @spec render_react(map) :: HTML.safe()
-  def render_react(assigns) do
-    Util.log_duration(__MODULE__, :do_render_react, [assigns])
-  end
+  defp tag_string(nil), do: nil
 
-  @spec do_render_react(map) :: HTML.safe()
-  def do_render_react(%{
-        itineraryData: data
-      }) do
-    React.render(
-      "TripPlannerResults",
-      %{
-        itineraryData: data
-      }
-    )
+  defp tag_string(tag),
+    do:
+      tag
+      |> Atom.to_string()
+      |> String.replace("_", " ")
+
+  @doc """
+  Encodes the trip plan with:
+  - An identifier for who generated the plan
+  - The datetime which the plan was returned
+  - The selected modes
+  - The serialized %Dotcom.TripPlan.Query{} containing:
+    - Wheelchair-only selection
+    - From location (name, coordinates, stop_id)
+    - To location (name, coordinates, stop_id)
+    - Time type (arrive by vs depart at)
+    - List of errors
+    - List of itineraries
+  """
+  def trip_plan_metadata(conn) do
+    query = Jason.encode!(conn.assigns[:query])
+
+    %{
+      "generated_user_id" => Map.get(conn.cookies, Cookies.id_cookie_name()),
+      "generated_time" => Timex.local(),
+      "modes" => conn.assigns[:modes],
+      "query" => Jason.decode!(query)
+    }
   end
 
   @spec get_one_way_total_by_type(TripPlan.Itinerary.t(), Fares.fare_type()) :: non_neg_integer
diff --git a/lib/leaflet/map_data.ex b/lib/leaflet/map_data.ex
index a624899674..b7e09af4a5 100644
--- a/lib/leaflet/map_data.ex
+++ b/lib/leaflet/map_data.ex
@@ -13,6 +13,7 @@ defmodule Leaflet.MapData do
 
   @type lat_lng :: %{latitude: float, longitude: float}
 
+  @derive Jason.Encoder
   defstruct default_center: %{latitude: 42.360718, longitude: -71.05891},
             height: 0,
             markers: [],
diff --git a/lib/leaflet/map_data/marker.ex b/lib/leaflet/map_data/marker.ex
index 15791ff05d..5deac31696 100644
--- a/lib/leaflet/map_data/marker.ex
+++ b/lib/leaflet/map_data/marker.ex
@@ -2,7 +2,7 @@ defmodule Leaflet.MapData.Marker do
   @moduledoc """
   Represents a leaflet map marker.
   """
-
+  @derive Jason.Encoder
   defstruct id: nil,
             icon: nil,
             icon_opts: nil,
diff --git a/lib/leaflet/map_data/polyline.ex b/lib/leaflet/map_data/polyline.ex
index 6f8cca08df..55dc4fe3cd 100644
--- a/lib/leaflet/map_data/polyline.ex
+++ b/lib/leaflet/map_data/polyline.ex
@@ -3,7 +3,7 @@ defmodule Leaflet.MapData.Polyline do
   Builds a struct for rendering a polyline on a Leaflet map.
   """
   alias RoutePatterns.RoutePattern
-
+  @derive Jason.Encoder
   defstruct color: "#000000",
             dotted?: false,
             id: "",
diff --git a/lib/trip_plan.ex b/lib/trip_plan.ex
index 1c5b6ae09c..f48211fd83 100644
--- a/lib/trip_plan.ex
+++ b/lib/trip_plan.ex
@@ -2,28 +2,6 @@ defmodule TripPlan do
   @moduledoc """
   Plan transit trips from one place to another.
   """
-  alias Util.Position
-
-  @doc """
-  Tries to describe how to get between two places.
-  """
-  @spec plan(
-          Position.t(),
-          Position.t(),
-          TripPlan.Api.connection_opts(),
-          TripPlan.Api.plan_opts(),
-          pid()
-        ) :: TripPlan.Api.t()
-  def plan(from, to, connection_opts, opts, parent \\ self()) do
-    apply(module(TripPlanApi), :plan, [
-      from,
-      to,
-      connection_opts,
-      opts,
-      parent
-    ])
-  end
-
   @doc """
   Finds the latitude/longitude for a given address.
   """
diff --git a/lib/trip_plan/api.ex b/lib/trip_plan/api.ex
deleted file mode 100644
index 6e33b26a1b..0000000000
--- a/lib/trip_plan/api.ex
+++ /dev/null
@@ -1,40 +0,0 @@
-defmodule TripPlan.Api do
-  @moduledoc """
-  Behaviour for planning modules.
-
-  They must implement the `plan/3` function, which takes an origin, destination and options,
-  and returns either a list of %Itinerary{} or an error.
-
-  """
-  alias TripPlan.Itinerary
-  alias Util.Position
-
-  @type plan_opt ::
-          {:arrive_by, DateTime.t()}
-          | {:depart_at, DateTime.t()}
-          | {:wheelchair_accessible?, boolean}
-          | {:optimize_for, :less_walking | :fewest_transfers}
-  @type plan_opts :: [plan_opt]
-
-  @type connection_opts :: [user_id: integer]
-
-  @type error ::
-          :outside_bounds
-          | :timeout
-          | :no_transit_times
-          | :too_close
-          | :location_not_accessible
-          | :path_not_found
-          | :unknown
-  @type t :: {:ok, [Itinerary.t()]} | {:error, error}
-
-  @doc """
-  Plans a trip between two locations.
-  """
-  @callback plan(
-              from :: Position.t(),
-              to :: Position.t(),
-              conn_opts :: connection_opts,
-              opts :: plan_opts
-            ) :: t
-end
diff --git a/lib/trip_plan/api/mock_planner.ex b/lib/trip_plan/api/mock_planner.ex
deleted file mode 100644
index 7236179b77..0000000000
--- a/lib/trip_plan/api/mock_planner.ex
+++ /dev/null
@@ -1,165 +0,0 @@
-defmodule TripPlan.Api.MockPlanner do
-  @moduledoc """
-  Used to create trip plans for testing.
-  """
-  @behaviour TripPlan.Api
-
-  alias TripPlan.{Itinerary, NamedPosition, Leg, PersonalDetail, TransitDetail}
-
-  @max_distance 1000
-  @max_duration 30 * 60
-
-  @selected_stops [
-    "place-sstat",
-    "place-north",
-    "place-bbsta",
-    "place-pktrm",
-    "place-rugg",
-    "place-gover"
-  ]
-
-  @selected_routes ~w(1 350 Blue Red)s
-
-  @impl true
-  def plan(from, to, connection_opts, opts) do
-    plan(from, to, connection_opts, opts, self())
-  end
-
-  def plan(%NamedPosition{name: "Geocoded path_not_found"}, _to, _opts, _connection_opts, _) do
-    {:error, :path_not_found}
-  end
-
-  def plan(%NamedPosition{name: "Geocoded Accessible error"} = from, to, connection_opts, opts, p) do
-    if Keyword.get(opts, :wheelchair_accessible?) do
-      {:error, :not_accessible}
-    else
-      plan(%{from | name: "Accessible error"}, to, connection_opts, opts, p)
-    end
-  end
-
-  def plan(
-        %NamedPosition{name: "Geocoded Inaccessible error"} = from,
-        to,
-        connection_opts,
-        opts,
-        p
-      ) do
-    if Keyword.get(opts, :wheelchair_accessible?) do
-      plan(%{from | name: "Inaccessible error"}, to, connection_opts, opts, p)
-    else
-      {:error, :not_accessible}
-    end
-  end
-
-  def plan(%NamedPosition{name: "Timeout error"}, _, _, _, _) do
-    :timer.sleep(:infinity)
-  end
-
-  def plan(from, to, connection_opts, opts, parent) do
-    start = DateTime.utc_now()
-    duration = :rand.uniform(@max_duration)
-    stop = Timex.shift(start, seconds: duration)
-    midpoint_stop1 = random_stop([], [from.stop_id, to.stop_id])
-    midpoint_time1 = Timex.shift(start, seconds: Integer.floor_div(duration, 3))
-    midpoint_stop2 = random_stop([], [from.stop_id, to.stop_id, midpoint_stop1.stop_id])
-    midpoint_time2 = Timex.shift(start, seconds: Integer.floor_div(duration, 3) * 2)
-
-    itineraries = [
-      %Itinerary{
-        start: start,
-        stop: stop,
-        legs: [
-          personal_leg(from, midpoint_stop1, start, midpoint_time1),
-          transit_leg(midpoint_stop1, midpoint_stop2, midpoint_time1, midpoint_time2),
-          personal_leg(midpoint_stop2, to, midpoint_time2, stop)
-        ],
-        accessible?: Keyword.get(opts, :wheelchair_accessible?, false)
-      }
-    ]
-
-    send(parent, {:planned_trip, {from, to, connection_opts, opts}, {:ok, itineraries}})
-    {:ok, itineraries}
-  end
-
-  @doc """
-  Extend a plan with an additional transit leg
-
-  Used in tests to make longer trip plans.
-  """
-  @spec add_transit_leg(Itinerary.t()) :: Itinerary.t()
-  def add_transit_leg(%Itinerary{} = itinerary) do
-    new_to = random_stop()
-    new_stop = Timex.shift(itinerary.stop, seconds: :rand.uniform(@max_duration))
-    new_leg = transit_leg(Itinerary.destination(itinerary), new_to, itinerary.stop, new_stop)
-    %{itinerary | stop: new_stop, legs: itinerary.legs ++ [new_leg]}
-  end
-
-  def random_stop(fields \\ [], without_stop_ids \\ []) do
-    stop_id = Enum.reject(@selected_stops, &Enum.member?(without_stop_ids, &1)) |> Enum.random()
-    stop = Stops.Repo.get!(stop_id)
-
-    fields =
-      Keyword.merge(
-        [
-          name: stop.name,
-          stop_id: stop_id,
-          latitude: stop.latitude,
-          longitude: stop.longitude
-        ],
-        fields
-      )
-
-    struct!(NamedPosition, fields)
-  end
-
-  def personal_leg(from, to, start, stop) do
-    distance = :rand.uniform() * @max_distance
-
-    %Leg{
-      start: start,
-      stop: stop,
-      from: from,
-      to: to,
-      mode: %PersonalDetail{
-        distance: distance,
-        steps: [random_step(), random_step()]
-      }
-    }
-  end
-
-  def random_step do
-    distance = :rand.uniform() * @max_distance
-    absolute_direction = Enum.random(~w(north east south west)a)
-    relative_direction = Enum.random(~w(left right depart continue)a)
-    street_name = "Random Street"
-
-    %PersonalDetail.Step{
-      distance: distance,
-      relative_direction: relative_direction,
-      absolute_direction: absolute_direction,
-      street_name: street_name
-    }
-  end
-
-  def transit_leg(from, to, start, stop) do
-    route_id = Enum.random(@selected_routes)
-    schedules = Schedules.Repo.by_route_ids([route_id], stop_sequences: :first)
-    trip_id = List.first(schedules).trip.id
-
-    %Leg{
-      start: start,
-      stop: stop,
-      from: from,
-      to: to,
-      mode: %TransitDetail{
-        route_id: route_id,
-        trip_id: trip_id,
-        intermediate_stop_ids:
-          Enum.random([
-            [List.first(schedules).stop.id],
-            []
-          ])
-      }
-    }
-  end
-end
diff --git a/lib/trip_plan/api/open_trip_planner.ex b/lib/trip_plan/api/open_trip_planner.ex
index 75751194a4..8559afd79e 100644
--- a/lib/trip_plan/api/open_trip_planner.ex
+++ b/lib/trip_plan/api/open_trip_planner.ex
@@ -1,188 +1,144 @@
 defmodule TripPlan.Api.OpenTripPlanner do
   @moduledoc "Fetches data from the OpenTripPlanner API."
-  @behaviour TripPlan.Api
-  require Logger
-  import __MODULE__.Builder, only: [build_params: 3]
-  import __MODULE__.Parser, only: [parse_ql: 2]
-
-  def plan(from, to, connection_opts, opts, _parent) do
-    plan(from, to, connection_opts, opts)
+  alias TripPlan.{
+    Itinerary,
+    Leg,
+    NamedPosition,
+    PersonalDetail,
+    PersonalDetail.Step,
+    TransitDetail
+  }
+
+  @transit_modes ~w(SUBWAY TRAM BUS RAIL FERRY)s
+
+  def plan(%NamedPosition{} = from, %NamedPosition{} = to, opts) do
+    plan(NamedPosition.to_keywords(from), NamedPosition.to_keywords(to), opts)
   end
 
-  @impl TripPlan.Api
-  def plan(from, to, _connection_opts, opts) do
-    accessible? = Keyword.get(opts, :wheelchair_accessible?, false)
-
-    with {:ok, params} <- build_params(from, to, opts) do
-      param_string = Enum.map_join(params, "\n", fn {key, val} -> ~s{#{key}: #{val}} end)
+  def plan(from, to, opts) do
+    otp_impl().plan(from, to, opts)
+    |> parse()
+  end
 
-      graphql_query = """
-      {
-        plan(
-          #{param_string}
-        )
-        #{itinerary_shape()}
-      }
-      """
+  defp otp_impl, do: Application.get_env(:dotcom, :trip_planner, OpenTripPlannerClient)
 
-      root_url = Keyword.get(opts, :root_url) || config(:otp_url)
-      graphql_url = "#{root_url}/otp/routers/default/index/"
+  defp parse({:error, _} = error), do: error
 
-      send_request(graphql_url, graphql_query, accessible?, &parse_ql/2)
-    end
+  defp parse({:ok, itineraries}) do
+    {:ok, Enum.map(itineraries, &parse_itinerary/1)}
   end
 
-  def config(key) do
-    Util.config(:dotcom, OpenTripPlanner, key)
+  defp parse_itinerary(json) do
+    score = json["accessibilityScore"]
+
+    %Itinerary{
+      start: parse_time(json["startTime"]),
+      stop: parse_time(json["endTime"]),
+      legs: Enum.map(json["legs"], &parse_leg/1),
+      accessible?: if(score, do: score == 1.0),
+      tag: json["tag"]
+    }
   end
 
-  defp send_request(url, query, accessible?, parser) do
-    with {:ok, response} <- log_response(url, query),
-         %{status: 200, body: body} <- response do
-      parser.(body, accessible?)
-    else
-      %{status: _} = response ->
-        {:error, response}
+  defp parse_time(ms_after_epoch) do
+    {:ok, ms_after_epoch_dt} =
+      ms_after_epoch
+      |> DateTime.from_unix(:millisecond)
 
-      error ->
-        error
-    end
+    Timex.to_datetime(
+      ms_after_epoch_dt,
+      Application.fetch_env!(:open_trip_planner_client, :timezone)
+    )
   end
 
-  defp log_response(url, query) do
-    graphql_req =
-      Req.new(base_url: url, headers: build_headers(config(:wiremock_proxy)))
-      |> AbsintheClient.attach()
+  defp parse_leg(json) do
+    %Leg{
+      start: parse_time(json["startTime"]),
+      stop: parse_time(json["endTime"]),
+      mode: parse_mode(json),
+      from: parse_named_position(json["from"], "stop"),
+      to: parse_named_position(json["to"], "stop"),
+      polyline: json["legGeometry"]["points"],
+      name: json["route"]["shortName"],
+      long_name: json["route"]["longName"],
+      type: json["agency"]["name"],
+      url: json["agency"]["url"],
+      description: json["mode"]
+    }
+  end
 
-    {duration, response} =
-      :timer.tc(
-        Req,
-        :post,
-        [graphql_req, [graphql: query]]
-      )
+  def parse_named_position(json, "stop") do
+    stop = json["stop"]
 
-    _ =
-      Logger.info(fn ->
-        "#{__MODULE__}.plan_response url=#{url} query=#{inspect(query)} #{status_text(response)} duration=#{duration / :timer.seconds(1)}"
-      end)
+    %NamedPosition{
+      name: json["name"],
+      stop_id: if(stop, do: id_after_colon(stop["gtfsId"])),
+      longitude: json["lon"],
+      latitude: json["lat"]
+    }
+  end
 
-    response
+  defp parse_mode(%{"mode" => "WALK"} = json) do
+    %PersonalDetail{
+      distance: json["distance"],
+      steps: Enum.map(json["steps"], &parse_step/1)
+    }
   end
 
-  defp build_headers("true") do
-    proxy_url = Application.get_env(:dotcom, OpenTripPlanner)[:wiremock_proxy_url]
-    [{"X-WM-Proxy-Url", proxy_url}]
+  defp parse_mode(%{"mode" => mode} = json) when mode in @transit_modes do
+    %TransitDetail{
+      route_id: id_after_colon(json["route"]["gtfsId"]),
+      trip_id: id_after_colon(json["trip"]["gtfsId"]),
+      intermediate_stop_ids: Enum.map(json["intermediateStops"], &id_after_colon(&1["gtfsId"]))
+    }
   end
 
-  defp build_headers(_), do: []
+  defp parse_step(json) do
+    %Step{
+      distance: json["distance"],
+      relative_direction: parse_relative_direction(json["relativeDirection"]),
+      absolute_direction: parse_absolute_direction(json["absoluteDirection"]),
+      street_name: json["streetName"]
+    }
+  end
 
-  defp status_text({:ok, %{status: code, body: body}}) do
-    string_body = Poison.encode!(body)
-    "status=#{code} content_length=#{byte_size(string_body)}"
+  # http://dev.opentripplanner.org/apidoc/1.0.0/json_RelativeDirection.html
+  for dir <- ~w(
+        depart
+        hard_left
+        left
+        slightly_left
+        continue
+        slightly_right
+        right
+        hard_right
+        circle_clockwise
+        circle_counterclockwise
+        elevator
+        uturn_left
+        uturn_right
+        enter_station
+        exit_station
+        follow_signs)a do
+    defp parse_relative_direction(unquote(String.upcase(Atom.to_string(dir)))), do: unquote(dir)
   end
 
-  defp status_text({:error, error}) do
-    "status=error error=#{inspect(error)}"
+  # http://dev.opentripplanner.org/apidoc/1.0.0/json_AbsoluteDirection.html
+  for dir <- ~w(north northeast east southeast south southwest west northwest)a do
+    defp parse_absolute_direction(unquote(String.upcase(Atom.to_string(dir)))), do: unquote(dir)
   end
 
-  defp itinerary_shape() do
-    """
-    {
-      routingErrors {
-        code
-        description
-      }
-      itineraries {
-        accessibilityScore
-        startTime
-        endTime
-        duration
-        legs {
-          mode
-          startTime
-          endTime
-          distance
-          duration
-          intermediateStops {
-            id
-            gtfsId
-            name
-            desc
-            lat
-            lon
-            code
-            locationType
-          }
-          transitLeg
-          headsign
-          realTime
-          realtimeState
-          agency {
-            id
-            gtfsId
-            name
-          }
-          alerts {
-            id
-            alertHeaderText
-            alertDescriptionText
-          }
-          fareProducts {
-            id
-            product {
-              id
-              name
-              riderCategory {
-                id
-                name
-              }
-            }
-          }
-          from {
-            name
-            lat
-            lon
-            departureTime
-            arrivalTime
-            stop {
-              gtfsId
-            }
-          }
-          to {
-            name
-            lat
-            lon
-            departureTime
-            arrivalTime
-            stop {
-              gtfsId
-            }
-          }
-          route {
-            gtfsId
-            longName
-            shortName
-            desc
-            color
-            textColor
-          }
-          trip {
-            gtfsId
-          }
-          steps {
-            distance
-            streetName
-            lat
-            lon
-            relativeDirection
-            stayOn
-          }
-          legGeometry {
-            points
-          }
-        }
-      }
-    }
-    """
+  defp parse_absolute_direction(nil), do: nil
+
+  defp id_after_colon(feed_colon_id) do
+    [feed, id] = String.split(feed_colon_id, ":", parts: 2)
+
+    # feed id is either mbta-ma-us (MBTA) or 22722274 (Massport), if it's neither, assume it's MBTA
+    case feed do
+      "mbta-ma-us" -> id
+      "22722274" -> "Massport-" <> id
+      "2272_2274" -> "Massport-" <> id
+      _ -> id
+    end
   end
 end
diff --git a/lib/trip_plan/api/open_trip_planner/builder.ex b/lib/trip_plan/api/open_trip_planner/builder.ex
deleted file mode 100644
index 350c59baa1..0000000000
--- a/lib/trip_plan/api/open_trip_planner/builder.ex
+++ /dev/null
@@ -1,98 +0,0 @@
-defmodule TripPlan.Api.OpenTripPlanner.Builder do
-  alias TripPlan.Api.OpenTripPlanner, as: OTP
-  alias TripPlan.NamedPosition
-  alias Util.Position
-
-  @doc "Convert general planning options into query params for OTP"
-  @spec build_params(Position.t(), Position.t(), TripPlan.Api.plan_opts()) ::
-          {:ok, %{String.t() => String.t()}} | {:error, any}
-  def build_params(from, to, opts) do
-    from_string = location(from)
-    to_string = location(to)
-    default_mode_string = "[{mode: WALK}, {mode: TRANSIT}]"
-
-    do_build_params(opts, %{
-      "fromPlace" => from_string,
-      "toPlace" => to_string,
-      "transportModes" => default_mode_string,
-      "walkReluctance" => 15,
-      "locale" => "\"en\""
-    })
-  end
-
-  defp location(%NamedPosition{stop_id: stop_id} = np) when not is_nil(stop_id) do
-    "\"#{np.name}::mbta-ma-us:#{stop_id}\""
-  end
-
-  defp location(%NamedPosition{} = np) do
-    "\"#{np.name}::#{Position.latitude(np)},#{Position.longitude(np)}\""
-  end
-
-  defp location(position) do
-    "\"#{Position.latitude(position)},#{Position.longitude(position)}\""
-  end
-
-  defp do_build_params([], acc) do
-    {:ok, acc}
-  end
-
-  defp do_build_params([{:wheelchair_accessible?, bool} | rest], acc) when is_boolean(bool) do
-    acc =
-      if bool do
-        put_in(acc["wheelchair"], "true")
-      else
-        acc
-      end
-
-    do_build_params(rest, acc)
-  end
-
-  defp do_build_params([{:depart_at, %DateTime{} = datetime} | rest], acc) do
-    acc = do_date_time("false", datetime, acc)
-    do_build_params(rest, acc)
-  end
-
-  defp do_build_params([{:arrive_by, %DateTime{} = datetime} | rest], acc) do
-    acc = do_date_time("true", datetime, acc)
-    do_build_params(rest, acc)
-  end
-
-  defp do_build_params([{:mode, []} | rest], acc) do
-    do_build_params(rest, acc)
-  end
-
-  defp do_build_params([{:mode, [_ | _] = modes} | rest], acc) do
-    all_modes = Enum.map(modes, fn m -> "{mode: #{m}}" end)
-    joined_modes = "[#{Enum.join(all_modes, ", ")}, {mode: WALK}]"
-    do_build_params(rest, Map.put(acc, "transportModes", joined_modes))
-  end
-
-  defp do_build_params([{:optimize_for, :less_walking} | rest], acc) do
-    do_build_params(rest, Map.put(acc, "walkReluctance", 27))
-  end
-
-  defp do_build_params([{:optimize_for, :fewest_transfers} | rest], acc) do
-    do_build_params(rest, Map.put(acc, "transferPenalty", 100))
-  end
-
-  # param is used for testing, ignore
-  defp do_build_params([{:root_url, _} | rest], acc) do
-    do_build_params(rest, acc)
-  end
-
-  defp do_build_params([option | _], _) do
-    {:error, {:bad_param, option}}
-  end
-
-  defp do_date_time(arriveBy, %DateTime{} = datetime, acc) do
-    local = Timex.to_datetime(datetime, OTP.config(:timezone))
-    date = Timex.format!(local, "\"{ISOdate}\"")
-    time = Timex.format!(local, "\"{h12}:{0m}{am}\"")
-
-    Map.merge(acc, %{
-      "date" => date,
-      "time" => time,
-      "arriveBy" => arriveBy
-    })
-  end
-end
diff --git a/lib/trip_plan/api/open_trip_planner/parser.ex b/lib/trip_plan/api/open_trip_planner/parser.ex
deleted file mode 100644
index 6405c7fd93..0000000000
--- a/lib/trip_plan/api/open_trip_planner/parser.ex
+++ /dev/null
@@ -1,200 +0,0 @@
-defmodule TripPlan.Api.OpenTripPlanner.Parser do
-  @moduledoc "Module for parsing the itinerary-related data from Open Trip Planner"
-  require Logger
-  alias TripPlan.Api.OpenTripPlanner, as: OTP
-
-  alias TripPlan.{
-    Itinerary,
-    Leg,
-    NamedPosition,
-    PersonalDetail,
-    PersonalDetail.Step,
-    TransitDetail
-  }
-
-  @transit_modes ~w(SUBWAY TRAM BUS RAIL FERRY)s
-
-  @spec parse_ql(map(), boolean()) :: {:ok, [Itinerary.t()]} | {:error, TripPlan.Api.error()}
-  def parse_ql(%{"data" => %{"plan" => nil}, "errors" => [head | _]}, _accessible?) do
-    _ =
-      Logger.warning(fn ->
-        "#{__MODULE__} trip_plan=error message=#{inspect(head["message"])}"
-      end)
-
-    {:error, :unknown}
-  end
-
-  def parse_ql(%{"data" => data}, accessible?) do
-    parse_map(data, accessible?)
-  end
-
-  @spec parse_map(map(), boolean()) :: {:ok, [Itinerary.t()]} | {:error, TripPlan.Api.error()}
-  defp parse_map(%{"plan" => %{"routingErrors" => [head | _]}}, accessible?) do
-    _ =
-      Logger.warning(fn ->
-        "#{__MODULE__} trip_plan=error message=#{inspect(head["code"])}"
-      end)
-
-    {:error, error_message_atom(head["code"], accessible?: accessible?)}
-  end
-
-  defp parse_map(json, _) do
-    _ =
-      Logger.info(fn ->
-        "#{__MODULE__} trip_plan=success count=#{Enum.count(json["plan"]["itineraries"])}"
-      end)
-
-    {:ok, Enum.map(json["plan"]["itineraries"], &parse_itinerary(&1))}
-  end
-
-  @doc "Test helper which matches off the :ok"
-  def parse_json(json_binary, accessible? \\ false) do
-    with {:ok, json} <- Poison.decode(json_binary) do
-      parse_map(json, accessible?)
-    end
-  rescue
-    _e in FunctionClauseError ->
-      {:error, :invalid_json}
-  end
-
-  @spec error_message_atom(String.t(), Keyword.t()) :: TripPlan.Api.error()
-  defp error_message_atom("OUTSIDE_BOUNDS", _opts), do: :outside_bounds
-  defp error_message_atom("REQUEST_TIMEOUT", _opts), do: :timeout
-  defp error_message_atom("NO_TRANSIT_TIMES", _opts), do: :no_transit_times
-  defp error_message_atom("TOO_CLOSE", _opts), do: :too_close
-  defp error_message_atom("PATH_NOT_FOUND", accessible?: true), do: :location_not_accessible
-  defp error_message_atom("PATH_NOT_FOUND", accessible?: false), do: :path_not_found
-  defp error_message_atom("LOCATION_NOT_ACCESSIBLE", _opts), do: :location_not_accessible
-  defp error_message_atom("NO_STOPS_IN_RANGE", _opts), do: :location_not_accessible
-  defp error_message_atom(_, _opts), do: :unknown
-
-  defp parse_itinerary(json) do
-    %Itinerary{
-      start: parse_time(json["startTime"]),
-      stop: parse_time(json["endTime"]),
-      legs: Enum.map(json["legs"], &parse_leg/1),
-      accessible?: parse_float(json["accessibilityScore"]) == 1.0
-    }
-  end
-
-  defp parse_float(fl) when is_float(fl), do: fl
-
-  defp parse_float(nil), do: 0.0
-
-  defp parse_float(str) do
-    result = Float.parse(str)
-
-    case result do
-      :error -> 0.0
-      _ -> result
-    end
-  end
-
-  defp parse_time(ms_after_epoch) do
-    {:ok, ms_after_epoch_dt} =
-      ms_after_epoch
-      |> DateTime.from_unix(:millisecond)
-
-    Timex.to_datetime(ms_after_epoch_dt, OTP.config(:timezone))
-  end
-
-  defp parse_leg(json) do
-    %Leg{
-      start: parse_time(json["startTime"]),
-      stop: parse_time(json["endTime"]),
-      mode: parse_mode(json),
-      from: parse_named_position(json["from"], "stop"),
-      to: parse_named_position(json["to"], "stop"),
-      polyline: json["legGeometry"]["points"],
-      name: json["route"],
-      long_name: json["routeLongName"],
-      type: json["agencyId"],
-      url: json["agencyUrl"],
-      description: json["mode"]
-    }
-  end
-
-  def parse_named_position(json, "stop") do
-    stop = json["stop"]
-
-    %NamedPosition{
-      name: json["name"],
-      stop_id: if(stop, do: id_after_colon(stop["gtfsId"])),
-      longitude: json["lon"],
-      latitude: json["lat"]
-    }
-  end
-
-  def parse_named_position(json, id_field) do
-    %NamedPosition{
-      name: json["name"],
-      stop_id: if(id_str = json[id_field], do: id_after_colon(id_str)),
-      longitude: json["lon"],
-      latitude: json["lat"]
-    }
-  end
-
-  defp parse_mode(%{"mode" => "WALK"} = json) do
-    %PersonalDetail{
-      distance: json["distance"],
-      steps: Enum.map(json["steps"], &parse_step/1)
-    }
-  end
-
-  defp parse_mode(%{"mode" => mode} = json) when mode in @transit_modes do
-    %TransitDetail{
-      route_id: id_after_colon(json["route"]["gtfsId"]),
-      trip_id: id_after_colon(json["trip"]["gtfsId"]),
-      intermediate_stop_ids: Enum.map(json["intermediateStops"], &id_after_colon(&1["gtfsId"]))
-    }
-  end
-
-  defp parse_step(json) do
-    %Step{
-      distance: json["distance"],
-      relative_direction: parse_relative_direction(json["relativeDirection"]),
-      absolute_direction: parse_absolute_direction(json["absoluteDirection"]),
-      street_name: json["streetName"]
-    }
-  end
-
-  # http://dev.opentripplanner.org/apidoc/1.0.0/json_RelativeDirection.html
-  for dir <- ~w(
-        depart
-        hard_left
-        left
-        slightly_left
-        continue
-        slightly_right
-        right
-        hard_right
-        circle_clockwise
-        circle_counterclockwise
-        elevator
-        uturn_left
-        uturn_right
-        enter_station
-        exit_station
-        follow_signs)a do
-    defp parse_relative_direction(unquote(String.upcase(Atom.to_string(dir)))), do: unquote(dir)
-  end
-
-  # http://dev.opentripplanner.org/apidoc/1.0.0/json_AbsoluteDirection.html
-  for dir <- ~w(north northeast east southeast south southwest west northwest)a do
-    defp parse_absolute_direction(unquote(String.upcase(Atom.to_string(dir)))), do: unquote(dir)
-  end
-
-  defp parse_absolute_direction(nil), do: nil
-
-  defp id_after_colon(feed_colon_id) do
-    [feed, id] = String.split(feed_colon_id, ":", parts: 2)
-
-    # feed id is either mbta-ma-us (MBTA) or 22722274 (Massport), if it's neither, assume it's MBTA
-    case feed do
-      "mbta-ma-us" -> id
-      "22722274" -> "Massport-" <> id
-      "2272_2274" -> "Massport-" <> id
-      _ -> id
-    end
-  end
-end
diff --git a/lib/trip_plan/itinerary.ex b/lib/trip_plan/itinerary.ex
index f97b9a11b6..bd7e29ee3d 100644
--- a/lib/trip_plan/itinerary.ex
+++ b/lib/trip_plan/itinerary.ex
@@ -13,11 +13,13 @@ defmodule TripPlan.Itinerary do
   alias Stops.Stop
   alias TripPlan.{Leg, NamedPosition, TransitDetail}
 
+  @derive {Jason.Encoder, except: [:passes]}
   @enforce_keys [:start, :stop]
   defstruct [
     :start,
     :stop,
     :passes,
+    :tag,
     legs: [],
     accessible?: false
   ]
@@ -26,8 +28,9 @@ defmodule TripPlan.Itinerary do
           start: DateTime.t(),
           stop: DateTime.t(),
           legs: [Leg.t()],
-          accessible?: boolean,
-          passes: passes()
+          accessible?: boolean | nil,
+          passes: passes(),
+          tag: OpenTripPlannerClient.ItineraryTag.tag()
         }
 
   @type passes :: %{
@@ -85,13 +88,6 @@ defmodule TripPlan.Itinerary do
     |> Enum.sum()
   end
 
-  @doc "Determines if two itineraries represent the same sequence of legs at the same time"
-  @spec same_itinerary?(t, t) :: boolean
-  def same_itinerary?(itinerary_1, itinerary_2) do
-    itinerary_1.start == itinerary_2.start && itinerary_1.stop == itinerary_2.stop &&
-      same_legs?(itinerary_2, itinerary_2)
-  end
-
   @doc "Return a lost of all of the "
   @spec intermediate_stop_ids(t) :: [Stop.id_t()]
   def intermediate_stop_ids(itinerary) do
@@ -106,12 +102,6 @@ defmodule TripPlan.Itinerary do
     end
   end
 
-  @spec same_legs?(t, t) :: boolean
-  defp same_legs?(%__MODULE__{legs: legs_1}, %__MODULE__{legs: legs_2}) do
-    Enum.count(legs_1) == Enum.count(legs_2) &&
-      legs_1 |> Enum.zip(legs_2) |> Enum.all?(fn {l1, l2} -> Leg.same_leg?(l1, l2) end)
-  end
-
   defp leg_intermediate(%Leg{mode: %TransitDetail{intermediate_stop_ids: ids}}) do
     ids
   end
diff --git a/lib/trip_plan/leg.ex b/lib/trip_plan/leg.ex
index b47952478a..6a12b29f18 100644
--- a/lib/trip_plan/leg.ex
+++ b/lib/trip_plan/leg.ex
@@ -7,6 +7,7 @@ defmodule TripPlan.Leg do
   """
   alias TripPlan.{PersonalDetail, TransitDetail, NamedPosition}
 
+  @derive {Jason.Encoder, only: [:from, :to, :mode]}
   defstruct start: DateTime.from_unix!(-1),
             stop: DateTime.from_unix!(0),
             mode: nil,
@@ -72,11 +73,6 @@ defmodule TripPlan.Leg do
     end
   end
 
-  @doc "Determines if two legs have the same to and from fields"
-  @spec same_leg?(t, t) :: boolean
-  def same_leg?(%__MODULE__{from: from, to: to}, %__MODULE__{from: from, to: to}), do: true
-  def same_leg?(_leg_1, _leg_2), do: false
-
   @spec stop_is_silver_line_airport?([t], atom) :: boolean()
   def stop_is_silver_line_airport?([], _), do: false
 
diff --git a/lib/trip_plan/named_position.ex b/lib/trip_plan/named_position.ex
index 1e2d6f77e3..df48e2a1b2 100644
--- a/lib/trip_plan/named_position.ex
+++ b/lib/trip_plan/named_position.ex
@@ -1,6 +1,7 @@
 defmodule TripPlan.NamedPosition do
   @moduledoc "Defines a position for a trip plan as a stop and/or lat/lon"
 
+  @derive Jason.Encoder
   defstruct name: "",
             stop_id: nil,
             latitude: nil,
@@ -17,4 +18,8 @@ defmodule TripPlan.NamedPosition do
     def latitude(%{latitude: latitude}), do: latitude
     def longitude(%{longitude: longitude}), do: longitude
   end
+
+  def to_keywords(%__MODULE__{name: name, stop_id: stop_id, latitude: lat, longitude: lon}) do
+    [name: name, stop_id: stop_id, lat_lon: {lat, lon}]
+  end
 end
diff --git a/lib/trip_plan/personal_detail.ex b/lib/trip_plan/personal_detail.ex
index 80b7e46f64..dea39466f4 100644
--- a/lib/trip_plan/personal_detail.ex
+++ b/lib/trip_plan/personal_detail.ex
@@ -2,6 +2,7 @@ defmodule TripPlan.PersonalDetail do
   @moduledoc """
   Additional information for legs which are taken on personal transportation
   """
+  @derive Jason.Encoder
   defstruct distance: 0.0,
             steps: []
 
@@ -15,6 +16,7 @@ defmodule TripPlan.PersonalDetail.Step do
   @moduledoc """
   A turn-by-turn direction
   """
+  @derive Jason.Encoder
   defstruct distance: 0.0,
             relative_direction: :depart,
             absolute_direction: :north,
diff --git a/lib/trip_plan/transit_detail.ex b/lib/trip_plan/transit_detail.ex
index 3b73317b42..83a1873e70 100644
--- a/lib/trip_plan/transit_detail.ex
+++ b/lib/trip_plan/transit_detail.ex
@@ -5,6 +5,7 @@ defmodule TripPlan.TransitDetail do
 
   alias Fares.Fare
 
+  @derive {Jason.Encoder, except: [:fares]}
   defstruct [:fares, route_id: "", trip_id: "", intermediate_stop_ids: []]
 
   @type t :: %__MODULE__{
diff --git a/mix.exs b/mix.exs
index 05f4e722d1..1e445ce77f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -93,8 +93,10 @@ defmodule DotCom.Mixfile do
       {:ex_aws_s3, "2.5.3"},
       {:ex_aws_ses, "2.4.1"},
       {:ex_doc, "0.31.1", only: :dev},
+      {:ex_machina, "2.7.0", only: :test},
       # latest version 0.18.0; cannot upgrade because expects castore >= 1
       {:excoveralls, "0.16.1", only: :test},
+      {:faker, "0.17.0", only: :test},
       {:floki, "0.35.3"},
       {:gen_stage, "1.2.1"},
       {:gettext, "0.24.0"},
@@ -109,8 +111,14 @@ defmodule DotCom.Mixfile do
       {:logster, "1.1.1"},
       {:mail, "0.3.1"},
       {:mock, "0.3.8", [only: :test]},
+      {:mox, "1.1.0", [only: :test]},
       {:nebulex, "2.6.0"},
       {:nebulex_redis_adapter, "2.3.1"},
+      {:open_trip_planner_client,
+       [
+         github: "thecristen/open_trip_planner_client",
+         ref: "v0.6.3"
+       ]},
       {:parallel_stream, "1.1.0"},
       # latest version 1.7.11
       {:phoenix, "1.6.16"},
diff --git a/mix.lock b/mix.lock
index 4983b7c853..e551b18e67 100644
--- a/mix.lock
+++ b/mix.lock
@@ -25,9 +25,11 @@
   "ex_aws_s3": {:hex, :ex_aws_s3, "2.5.3", "422468e5c3e1a4da5298e66c3468b465cfd354b842e512cb1f6fbbe4e2f5bdaf", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm", "4f09dd372cc386550e484808c5ac5027766c8d0cd8271ccc578b82ee6ef4f3b8"},
   "ex_aws_ses": {:hex, :ex_aws_ses, "2.4.1", "1aa945610121c9891054c27d0f71f5799b2e0a2062044d742d89c1cee251f9e2", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}], "hexpm", "dddac42d4d7b826f7099bbe7402a35e68eb76434d6c58bfa332002ea2b522645"},
   "ex_doc": {:hex, :ex_doc, "0.31.1", "8a2355ac42b1cc7b2379da9e40243f2670143721dd50748bf6c3b1184dae2089", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "3178c3a407c557d8343479e1ff117a96fd31bafe52a039079593fb0524ef61b0"},
+  "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "excoveralls": {:hex, :excoveralls, "0.16.1", "0bd42ed05c7d2f4d180331a20113ec537be509da31fed5c8f7047ce59ee5a7c5", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "dae763468e2008cf7075a64cb1249c97cb4bc71e236c5c2b5e5cdf1cfa2bf138"},
   "expo": {:hex, :expo, "0.5.1", "249e826a897cac48f591deba863b26c16682b43711dd15ee86b92f25eafd96d9", [:mix], [], "hexpm", "68a4233b0658a3d12ee00d27d37d856b1ba48607e7ce20fd376958d0ba6ce92b"},
+  "faker": {:hex, :faker, "0.17.0", "671019d0652f63aefd8723b72167ecdb284baf7d47ad3a82a15e9b8a6df5d1fa", [:mix], [], "hexpm", "a7d4ad84a93fd25c5f5303510753789fc2433ff241bf3b4144d3f6f291658a6a"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "finch": {:hex, :finch, "0.17.0", "17d06e1d44d891d20dbd437335eebe844e2426a0cd7e3a3e220b461127c73f70", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8d014a661bb6a437263d4b5abf0bcbd3cf0deb26b1e8596f2a271d22e48934c7"},
   "floki": {:hex, :floki, "0.35.3", "0c8c6234aa71cb2b069cf801e8f8f30f8d096eb452c3dae2ccc409510ec32720", [:mix], [], "hexpm", "6d9f07f3fc76599f3b66c39f4a81ac62c8f4d9631140268db92aacad5d0e56d4"},
@@ -55,11 +57,13 @@
   "mint_web_socket": {:hex, :mint_web_socket, "1.0.3", "aab42fff792a74649916236d0b01f560a0b3f03ca5dea693c230d1c44736b50e", [:mix], [{:mint, ">= 1.4.1 and < 2.0.0-0", [hex: :mint, repo: "hexpm", optional: false]}], "hexpm", "ca3810ca44cc8532e3dce499cc17f958596695d226bb578b2fbb88c09b5954b0"},
   "mochiweb": {:hex, :mochiweb, "2.22.0", "f104d6747c01a330c38613561977e565b788b9170055c5241ac9dd6e4617cba5", [:rebar3], [], "hexpm", "cbbd1fd315d283c576d1c8a13e0738f6dafb63dc840611249608697502a07655"},
   "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"},
+  "mox": {:hex, :mox, "1.1.0", "0f5e399649ce9ab7602f72e718305c0f9cdc351190f72844599545e4996af73c", [:mix], [], "hexpm", "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"},
   "nebulex": {:hex, :nebulex, "2.6.0", "6e581c0b53aab80a1431488d367a41c6a8ee53763f86e7a7a6754ee571ecfdab", [:mix], [{:decorator, "~> 1.4", [hex: :decorator, repo: "hexpm", optional: true]}, {:shards, "~> 1.1", [hex: :shards, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "cf4a0040bd6d58b8d0204f668641973520fdbd78bd8618e1cdb7a11e7bc560cf"},
   "nebulex_redis_adapter": {:hex, :nebulex_redis_adapter, "2.3.1", "ea57629ee21f78332ca8d0356e6777d2fdbd6755b7453e298557091b6f8811f6", [:mix], [{:crc, "~> 0.10", [hex: :crc, repo: "hexpm", optional: true]}, {:jchash, "~> 0.1", [hex: :jchash, repo: "hexpm", optional: true]}, {:nebulex, "~> 2.5", [hex: :nebulex, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.5 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:redix, "~> 1.2", [hex: :redix, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "8384bf249af7c0b9903578b5c75a18157562863054952dbaea55dfe7255b75e7"},
   "nimble_options": {:hex, :nimble_options, "1.1.0", "3b31a57ede9cb1502071fade751ab0c7b8dbe75a9a4c2b5bbb0943a690b63172", [:mix], [], "hexpm", "8bbbb3941af3ca9acc7835f5655ea062111c9c27bcac53e004460dfd19008a99"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "nimble_pool": {:hex, :nimble_pool, "1.0.0", "5eb82705d138f4dd4423f69ceb19ac667b3b492ae570c9f5c900bb3d2f50a847", [:mix], [], "hexpm", "80be3b882d2d351882256087078e1b1952a28bf98d0a287be87e4a24a710b67a"},
+  "open_trip_planner_client": {:git, "https://github.com/thecristen/open_trip_planner_client.git", "db72c188f45e2b332168001614548df90cb6814a", [ref: "v0.6.3"]},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "phoenix": {:hex, :phoenix, "1.6.16", "e5bdd18c7a06da5852a25c7befb72246de4ddc289182285f8685a40b7b5f5451", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"},
diff --git a/test/dotcom/trip_plan/alerts_test.exs b/test/dotcom/trip_plan/alerts_test.exs
index 384b225619..30f1cca610 100644
--- a/test/dotcom/trip_plan/alerts_test.exs
+++ b/test/dotcom/trip_plan/alerts_test.exs
@@ -2,23 +2,29 @@ defmodule Dotcom.TripPlan.AlertsTest do
   @moduledoc false
   use ExUnit.Case, async: true
   import Dotcom.TripPlan.Alerts
+  import Test.Support.Factory
   alias TripPlan.Itinerary
   alias Alerts.Alert
   alias Alerts.InformedEntity, as: IE
 
-  @from TripPlan.Api.MockPlanner.random_stop(stop_id: nil)
-  @to TripPlan.Api.MockPlanner.random_stop(stop_id: nil)
-  @connection_opts [user_id: 1]
-  @date_time ~N[2017-06-27T11:43:00]
+  setup_all do
+    itinerary =
+      build(:itinerary,
+        legs: [
+          build(:leg,
+            from: build(:stop_named_position),
+            to: build(:stop_named_position),
+            mode: build(:transit_detail)
+          )
+        ]
+      )
+
+    [route_id] = Itinerary.route_ids(itinerary)
+    [trip_id] = Itinerary.trip_ids(itinerary)
+    {:ok, %{itinerary: itinerary, route_id: route_id, trip_id: trip_id}}
+  end
 
   describe "filter_for_itinerary/2" do
-    setup do
-      {:ok, [itinerary]} = TripPlan.plan(@from, @to, @connection_opts, depart_at: @date_time)
-      [route_id] = Itinerary.route_ids(itinerary)
-      [trip_id] = Itinerary.trip_ids(itinerary)
-      {:ok, %{itinerary: itinerary, route_id: route_id, trip_id: trip_id}}
-    end
-
     test "returns an alert if it affects the route", %{itinerary: itinerary, route_id: route_id} do
       good_alert =
         Alert.new(
diff --git a/test/dotcom/trip_plan/itinerary_row_list_test.exs b/test/dotcom/trip_plan/itinerary_row_list_test.exs
index 8ed64db344..519c2a54d7 100644
--- a/test/dotcom/trip_plan/itinerary_row_list_test.exs
+++ b/test/dotcom/trip_plan/itinerary_row_list_test.exs
@@ -2,17 +2,41 @@ defmodule Dotcom.TripPlan.ItineraryRowListTest do
   use ExUnit.Case, async: true
   alias Dotcom.TripPlan.ItineraryRow
   import Dotcom.TripPlan.ItineraryRowList
+  import Test.Support.Factory
 
-  @from TripPlan.Api.MockPlanner.random_stop(stop_id: "place-sstat")
-  @to TripPlan.Api.MockPlanner.random_stop(stop_id: nil)
-  @connection_opts [user_id: 1]
   @date_time ~N[2017-06-27T11:43:00]
+  @from build(:stop_named_position, stop_id: "place-sstat")
+  @to build(:named_position)
 
   describe "from_itinerary" do
     setup do
       # Start parent supervisor - Dotcom.TripPlan.ItineraryRow.get_additional_routes/5 needs this to be running.
       _ = start_supervised(Dotcom.GreenLine.Supervisor)
-      {:ok, [itinerary]} = TripPlan.plan(@from, @to, @connection_opts, depart_at: @date_time)
+
+      # these rows depend on the itinerary having some sort of logic more
+      # advanced than randomly generated data. so here we make sure the legs are
+      # timed in sequence.
+      itinerary =
+        build(:itinerary,
+          start: @date_time,
+          stop: Timex.shift(@date_time, minutes: 60),
+          legs: [
+            build(:leg,
+              from: @from,
+              start: Timex.shift(@date_time, minutes: 10),
+              stop: Timex.shift(@date_time, minutes: 20)
+            ),
+            build(:leg,
+              start: Timex.shift(@date_time, minutes: 30),
+              stop: Timex.shift(@date_time, minutes: 40)
+            ),
+            build(:leg,
+              to: @to,
+              start: Timex.shift(@date_time, minutes: 50),
+              stop: Timex.shift(@date_time, minutes: 60)
+            )
+          ]
+        )
 
       deps = %ItineraryRow.Dependencies{
         route_mapper: &route_mapper/1,
@@ -41,10 +65,16 @@ defmodule Dotcom.TripPlan.ItineraryRowListTest do
     end
 
     test "ItineraryRow contains given stop name when no stop_id present", %{deps: deps} do
-      from = TripPlan.Api.MockPlanner.random_stop(stop_id: nil)
-      to = TripPlan.Api.MockPlanner.random_stop(stop_id: "place-sstat")
+      from = build(:stop_named_position, stop_id: nil)
+      to = build(:stop_named_position, stop_id: "place-sstat")
       date_time = ~N[2017-06-27T11:43:00]
-      {:ok, [itinerary]} = TripPlan.plan(from, to, @connection_opts, depart_at: date_time)
+
+      itinerary =
+        build(:itinerary,
+          start: date_time,
+          legs: [build(:leg, from: from)] ++ build_list(3, :leg) ++ [build(:leg, to: to)]
+        )
+
       itinerary_row_list = from_itinerary(itinerary, deps)
 
       itinerary_destination =
@@ -108,12 +138,7 @@ defmodule Dotcom.TripPlan.ItineraryRowListTest do
 
     test "Distance is given with personal steps", %{itinerary: itinerary, deps: deps} do
       leg =
-        TripPlan.Api.MockPlanner.personal_leg(
-          @from,
-          @to,
-          @date_time,
-          Timex.shift(@date_time, minutes: 15)
-        )
+        build(:leg, mode: build(:personal_detail))
 
       personal_itinerary = %{itinerary | legs: [leg]}
       row_list = from_itinerary(personal_itinerary, deps)
@@ -140,8 +165,13 @@ defmodule Dotcom.TripPlan.ItineraryRowListTest do
     end
 
     test "Does not replace to stop_id", %{deps: deps} do
-      to = TripPlan.Api.MockPlanner.random_stop(stop_id: "place-north")
-      {:ok, [itinerary]} = TripPlan.plan(@from, to, @connection_opts, depart_at: @date_time)
+      to = build(:stop_named_position, stop_id: "place-north")
+
+      itinerary =
+        build(:itinerary,
+          start: @date_time,
+          legs: [build(:leg, from: @from)] ++ build_list(3, :leg) ++ [build(:leg, to: to)]
+        )
 
       {name, id, _datetime, _alerts} =
         itinerary |> from_itinerary(deps, to: "Final Destination") |> Map.get(:destination)
@@ -151,8 +181,13 @@ defmodule Dotcom.TripPlan.ItineraryRowListTest do
     end
 
     test "Uses given from name when one is provided", %{deps: deps} do
-      from = TripPlan.Api.MockPlanner.random_stop(stop_id: nil)
-      {:ok, [itinerary]} = TripPlan.plan(from, @to, @connection_opts, depart_at: @date_time)
+      from = build(:named_position)
+
+      itinerary =
+        build(:itinerary,
+          start: @date_time,
+          legs: [build(:leg, from: from)] ++ build_list(3, :leg) ++ [build(:leg, to: @to)]
+        )
 
       {name, nil} =
         itinerary |> from_itinerary(deps, from: "Starting Point") |> Enum.at(0) |> Map.get(:stop)
diff --git a/test/dotcom/trip_plan/itinerary_row_test.exs b/test/dotcom/trip_plan/itinerary_row_test.exs
index e9e8dbe064..a9b0d542c2 100644
--- a/test/dotcom/trip_plan/itinerary_row_test.exs
+++ b/test/dotcom/trip_plan/itinerary_row_test.exs
@@ -2,10 +2,11 @@ defmodule TripPlan.ItineraryRowTest do
   use ExUnit.Case, async: true
 
   import Dotcom.TripPlan.ItineraryRow
+  import Test.Support.Factory
   alias Dotcom.TripPlan.ItineraryRow
   alias Routes.Route
   alias Alerts.{Alert, InformedEntity}
-  alias TripPlan.{Api.MockPlanner, Leg, NamedPosition, PersonalDetail}
+  alias TripPlan.{Leg, NamedPosition, PersonalDetail}
 
   describe "route_id/1" do
     test "returns the route id when a route is present" do
@@ -312,19 +313,9 @@ defmodule TripPlan.ItineraryRowTest do
 
   describe "from_leg/3" do
     @deps %ItineraryRow.Dependencies{stop_mapper: &Stops.Repo.get_parent/1}
-    @leg MockPlanner.personal_leg(MockPlanner.random_stop(), MockPlanner.random_stop(), nil, nil)
-    @personal_leg MockPlanner.personal_leg(
-                    MockPlanner.random_stop(),
-                    MockPlanner.random_stop(),
-                    nil,
-                    nil
-                  )
-    @transit_leg MockPlanner.transit_leg(
-                   MockPlanner.random_stop(),
-                   MockPlanner.random_stop(),
-                   nil,
-                   nil
-                 )
+    @leg build(:leg)
+    @personal_leg build(:leg, mode: build(:personal_detail))
+    @transit_leg build(:leg, mode: build(:transit_detail))
 
     test "returns an itinerary row from a Leg" do
       row = from_leg(@leg, @deps, nil)
@@ -333,11 +324,11 @@ defmodule TripPlan.ItineraryRowTest do
 
     test "formats transfer steps differently based on subsequent Leg" do
       leg = %Leg{
-        @leg
+        @personal_leg
         | mode: %PersonalDetail{
             steps: [
               %PersonalDetail.Step{relative_direction: :depart, street_name: "Transfer"}
-              | @leg.mode.steps
+              | @personal_leg.mode.steps
             ]
           }
       }
diff --git a/test/dotcom/trip_plan/merge_test.exs b/test/dotcom/trip_plan/merge_test.exs
deleted file mode 100644
index 28b796e4dc..0000000000
--- a/test/dotcom/trip_plan/merge_test.exs
+++ /dev/null
@@ -1,59 +0,0 @@
-defmodule Dotcom.TripPlan.MergeTest do
-  @moduledoc false
-  use ExUnit.Case
-  use Quixir
-
-  import Dotcom.TripPlan.Merge
-
-  doctest Dotcom.TripPlan.Merge
-
-  defp do_merge(accessible, unknown) do
-    accessible = accessible |> Enum.sort() |> Enum.dedup()
-    unknown = unknown |> Enum.sort() |> Enum.dedup()
-    merged = merge(accessible, unknown, &==/2)
-    {accessible, unknown, merged}
-  end
-
-  describe "merge/3" do
-    test "includes no duplicates" do
-      ptest accessible: list(of: positive_int(), max: 5),
-            unknown: list(of: positive_int(), max: 5) do
-        {_, _, merged} = do_merge(accessible, unknown)
-        assert Enum.uniq(merged) == merged
-      end
-    end
-
-    test "includes no duplicates when the first elements don't match" do
-      unknown = [{1, :unknown}, {2, :unknown}, {3, :unknown}]
-      accessible = [{2, :accessible}, {3, :accessible}]
-      equal_fn = fn {accessible, _}, {unknown, _} -> accessible == unknown end
-
-      merged = merge(accessible, unknown, equal_fn, needed_accessible: 2, needed_unknown: 2)
-      assert merged == [{1, :unknown}, {2, :accessible}, {3, :accessible}]
-    end
-
-    test "includes no more than total items" do
-      ptest accessible: list(of: positive_int(), max: 5),
-            unknown: list(of: positive_int(), max: 5),
-            total: int(min: 2) do
-        merged = merge(accessible, unknown, &==/2, total: total)
-        assert length(merged) <= total
-      end
-    end
-
-    test "always includes the first items in the lists" do
-      ptest accessible: list(of: positive_int(), max: 5),
-            unknown: list(of: positive_int(), max: 5) do
-        {accessible, unknown, merged} = do_merge(accessible, unknown)
-
-        unless accessible == [] do
-          assert List.first(accessible) in merged
-        end
-
-        unless unknown == [] do
-          assert List.first(unknown) in merged
-        end
-      end
-    end
-  end
-end
diff --git a/test/dotcom/trip_plan/query_test.exs b/test/dotcom/trip_plan/query_test.exs
index 645c86cf34..23217fe77b 100644
--- a/test/dotcom/trip_plan/query_test.exs
+++ b/test/dotcom/trip_plan/query_test.exs
@@ -2,6 +2,7 @@ defmodule Dotcom.TripPlan.QueryTest do
   use ExUnit.Case, async: true
 
   import Dotcom.TripPlan.Query
+  import Mox
   alias Dotcom.TripPlan.Query
   alias TripPlan.NamedPosition
 
@@ -23,29 +24,24 @@ defmodule Dotcom.TripPlan.QueryTest do
       |> DateTime.to_date()
   ]
 
-  @connection_opts [
-    user_id: 1
-  ]
+  setup :verify_on_exit!
+
+  setup do
+    stub_with(OpenTripPlannerClient.Mock, Test.Support.OpenTripPlannerClientStub)
+    :ok
+  end
 
   describe "from_query/1" do
     test "can plan a basic trip with defaults from query params" do
       params = %{"from" => "from address", "to" => "to address"}
-      actual = from_query(params, @connection_opts, @date_opts)
+      actual = from_query(params, @date_opts)
       assert actual.errors == MapSet.new([])
       assert_received {:geocoded_address, "from address", {:ok, from_position}}
       assert_received {:geocoded_address, "to address", {:ok, to_position}}
 
-      assert_received {:planned_trip,
-                       {^from_position, ^to_position, @connection_opts, first_opts},
-                       {:ok, accessible_itineraries}}
-
-      assert_received {:planned_trip,
-                       {^from_position, ^to_position, @connection_opts, second_opts},
-                       {:ok, nonaccessible_itineraries}}
-
-      assert length(
-               Enum.filter([first_opts, second_opts], &Keyword.get(&1, :wheelchair_accessible?))
-             ) == 1
+      from = NamedPosition.to_keywords(from_position)
+      to = NamedPosition.to_keywords(to_position)
+      assert_received {:planned_trip, {^from, ^to, _opts}, {:ok, itineraries}}
 
       assert %Query{} = actual
       assert actual.from == from_position
@@ -54,27 +50,29 @@ defmodule Dotcom.TripPlan.QueryTest do
       assert {:ok, actual_itineraries} = actual.itineraries
 
       assert Enum.sort(actual_itineraries) ==
-               Enum.sort(accessible_itineraries ++ nonaccessible_itineraries)
+               Enum.sort(itineraries)
     end
 
     test "can plan a basic trip from query params" do
       params = %{
         "from" => "from address",
         "to" => "to address",
-        "optimize_for" => "accessibility",
+        "wheelchair" => "true",
         "date_time" => @date_time_params
       }
 
-      actual = from_query(params, @connection_opts, @date_opts)
+      actual = from_query(params, @date_opts)
       assert actual.errors == MapSet.new([])
       assert_received {:geocoded_address, "from address", {:ok, from_position}}
       assert_received {:geocoded_address, "to address", {:ok, to_position}}
-      assert_received {:planned_trip, {^from_position, ^to_position, _, _}, {:ok, itineraries}}
+      from = NamedPosition.to_keywords(from_position)
+      to = NamedPosition.to_keywords(to_position)
+      assert_received {:planned_trip, {^from, ^to, _}, {:ok, itineraries}}
       assert %Query{} = actual
       assert actual.from == from_position
       assert actual.to == to_position
       assert {:depart_at, %DateTime{}} = actual.time
-      assert actual.wheelchair_accessible?
+      assert actual.wheelchair
       assert actual.itineraries == {:ok, itineraries}
     end
 
@@ -84,11 +82,11 @@ defmodule Dotcom.TripPlan.QueryTest do
         "to" => "Your current location",
         "to_latitude" => "42.3428",
         "to_longitude" => "-71.0857",
-        "optimize_for" => "accessibility",
+        "wheelchair" => "true",
         "date_time" => @date_time_params
       }
 
-      actual = from_query(params, @connection_opts, @date_opts)
+      actual = from_query(params, @date_opts)
 
       to_position = %TripPlan.NamedPosition{
         latitude: 42.3428,
@@ -97,7 +95,9 @@ defmodule Dotcom.TripPlan.QueryTest do
       }
 
       assert_received {:geocoded_address, "from address", {:ok, from_position}}
-      assert_received {:planned_trip, {^from_position, ^to_position, _, _}, {:ok, itineraries}}
+      from = NamedPosition.to_keywords(from_position)
+      to = NamedPosition.to_keywords(to_position)
+      assert_received {:planned_trip, {^from, ^to, _}, {:ok, itineraries}}
       assert %Query{} = actual
       assert actual.from == from_position
       assert actual.to == to_position
@@ -111,13 +111,15 @@ defmodule Dotcom.TripPlan.QueryTest do
         "from_longitude" => "",
         "to" => "to address",
         "date_time" => @date_time_params,
-        "optimize_for" => "accessibility"
+        "wheelchair" => "true"
       }
 
-      actual = from_query(params, @connection_opts, @date_opts)
+      actual = from_query(params, @date_opts)
       assert_received {:geocoded_address, "from address", {:ok, from_position}}
       assert_received {:geocoded_address, "to address", {:ok, to_position}}
-      assert_received {:planned_trip, {^from_position, ^to_position, _, _}, {:ok, itineraries}}
+      from = NamedPosition.to_keywords(from_position)
+      to = NamedPosition.to_keywords(to_position)
+      assert_received {:planned_trip, {^from, ^to, _}, {:ok, itineraries}}
       assert %Query{} = actual
       assert actual.from == from_position
       assert actual.to == to_position
@@ -126,7 +128,7 @@ defmodule Dotcom.TripPlan.QueryTest do
 
     test "ignores params that are empty strings or missing" do
       params = %{"from" => ""}
-      actual = from_query(params, @connection_opts, @date_opts)
+      actual = from_query(params, @date_opts)
       assert %Query{} = actual
       assert actual.from == {:error, :required}
       assert actual.to == nil
@@ -139,19 +141,15 @@ defmodule Dotcom.TripPlan.QueryTest do
         "to" => "to address",
         "time" => "arrive",
         "date_time" => @date_time_params,
-        "include_car?" => "false",
-        "optimize_for" => "accessibility"
+        "wheelchair" => "true"
       }
 
-      query = from_query(params, @connection_opts, @date_opts)
+      query = from_query(params, @date_opts)
       assert {:arrive_by, %DateTime{}} = query.time
-      assert query.wheelchair_accessible?
-
-      assert_received {:planned_trip, {_from_position, _to_position, _, opts},
-                       {:ok, _itineraries}}
-
+      assert_received {:planned_trip, {_from_position, _to_position, opts}, {:ok, _itineraries}}
+      assert query.wheelchair
       assert opts[:arrive_by] == @date_time
-      assert opts[:wheelchair_accessible?]
+      assert opts[:wheelchair]
     end
 
     test "depart_at time works as expected" do
@@ -160,18 +158,20 @@ defmodule Dotcom.TripPlan.QueryTest do
         "to" => "to address",
         "time" => "depart",
         "date_time" => @date_time_params,
-        "optimize_for" => "accessibility"
+        "wheelchair" => "true"
       }
 
-      actual = from_query(params, @connection_opts, @date_opts)
+      actual = from_query(params, @date_opts)
       assert_received {:geocoded_address, "from address", {:ok, from_position}}
       assert_received {:geocoded_address, "to address", {:ok, to_position}}
-      assert_received {:planned_trip, {^from_position, ^to_position, _, _}, {:ok, itineraries}}
+      from = NamedPosition.to_keywords(from_position)
+      to = NamedPosition.to_keywords(to_position)
+      assert_received {:planned_trip, {^from, ^to, _}, {:ok, itineraries}}
       assert %Query{} = actual
       assert actual.from === from_position
       assert actual.to === to_position
       assert actual.time === {:depart_at, @date_time}
-      assert actual.wheelchair_accessible? === true
+      assert actual.wheelchair === true
       assert actual.itineraries == {:ok, itineraries}
     end
 
@@ -183,7 +183,7 @@ defmodule Dotcom.TripPlan.QueryTest do
         "date_time" => @date_time_params
       }
 
-      actual = from_query(params, @connection_opts, @date_opts)
+      actual = from_query(params, @date_opts)
       assert_received {:geocoded_address, "no results", from_result}
       assert_received {:geocoded_address, "too many results", to_result}
       refute_received {:planned_trip, _, _, _}
@@ -196,84 +196,25 @@ defmodule Dotcom.TripPlan.QueryTest do
     end
 
     test "keeps original from/to if no trips are found" do
+      error = {:error, :path_not_found}
+
+      expect(OpenTripPlannerClient.Mock, :plan, fn _, _, _ ->
+        error
+      end)
+
       params = %{
         "from" => "path_not_found",
         "to" => "stops_nearby no_results",
         "time" => "depart",
         "date_time" => @date_time_params,
-        "include_car?" => "false",
         "accessible" => "true"
       }
 
-      query = from_query(params, @connection_opts, @date_opts)
+      query = from_query(params, @date_opts)
       assert %Query{} = query
       assert %NamedPosition{name: "Geocoded path_not_found"} = query.from
       assert %NamedPosition{name: "Geocoded stops_nearby no_results"} = query.to
-      assert query.itineraries == {:error, :path_not_found}
-    end
-
-    test "makes single request when accessibility is checked" do
-      params = %{
-        "from" => "from_address",
-        "to" => "to address",
-        "time" => "depart",
-        "date_time" => @date_time_params,
-        "optimize_for" => "accessibility"
-      }
-
-      assert %Query{} = from_query(params, @connection_opts, @date_opts)
-
-      inaccessible_opts = [
-        wheelchair_accessible?: false,
-        depart_at: @date_time
-      ]
-
-      refute_received {:planned_trip, {_from, _to, _, ^inaccessible_opts}, {:ok, _itineraries}}
-      assert_received {:planned_trip, {_from, _to, _, opts}, {:ok, itineraries}}
-      assert Keyword.get(opts, :wheelchair_accessible?)
-      assert Enum.all?(itineraries, & &1.accessible?)
-    end
-
-    test "When accessible trip returns error, all returned trips are marked as not accessible" do
-      params = %{
-        "from" => "Accessible error",
-        "to" => "to address",
-        "time" => "depart",
-        "date_time" => @date_time_params
-      }
-
-      {:ok, itineraries} = from_query(params, @connection_opts, @date_opts).itineraries
-      refute Enum.any?(itineraries, & &1.accessible?)
-    end
-
-    test "When inaccessible trip returns error, all accessible trips are returned" do
-      params = %{
-        "from" => "Inaccessible error",
-        "to" => "to address",
-        "time" => "depart",
-        "date_time" => @date_time_params
-      }
-
-      {:ok, itineraries} = from_query(params, @connection_opts, @date_opts).itineraries
-      assert Enum.all?(itineraries, & &1.accessible?)
-    end
-
-    test "Handles timeout gracefully" do
-      params = %{
-        "from" => "Timeout error",
-        "from_latitude" => "1",
-        "from_longitude" => "1",
-        "to" => "to address",
-        "date_time" => @date_time_params
-      }
-
-      log =
-        ExUnit.CaptureLog.capture_log(fn ->
-          assert %Query{itineraries: {:error, :timeout}} =
-                   from_query(params, @connection_opts, @date_opts)
-        end)
-
-      assert log =~ "timed out"
+      assert ^error = query.itineraries
     end
   end
 
@@ -289,40 +230,33 @@ defmodule Dotcom.TripPlan.QueryTest do
              ]
     end
 
-    test "handles optimize_for options" do
+    test "handles wheelchair option" do
       assert opts_from_query(
                %{
-                 "optimize_for" => "accessibility"
+                 "wheelchair" => "true"
                },
                []
              ) == [
-               wheelchair_accessible?: true
+               wheelchair: true
              ]
+    end
 
-      assert opts_from_query(
-               %{
-                 "optimize_for" => "less_walking"
-               },
-               []
-             ) == [
-               optimize_for: :less_walking
+    test "adds an empty list to opts if all modes are disabled" do
+      assert opts_from_query(%{"modes" => %{"subway" => "false", "bus" => "false"}}, []) == [
+               mode: []
              ]
+    end
 
+    test "adds a list of specific modes if any modes are enabled" do
       assert opts_from_query(
-               %{
-                 "optimize_for" => "fewest_transfers"
-               },
+               %{"modes" => %{"subway" => "false", "bus" => "true", "commuter_rail" => "true"}},
                []
-             ) == [
-               optimize_for: :fewest_transfers
-             ]
+             ) ==
+               [mode: ["RAIL", "BUS"]]
 
-      assert opts_from_query(
-               %{
-                 "optimize_for" => "best_route"
-               },
-               []
-             ) == []
+      assert opts_from_query(%{"modes" => %{"subway" => "true", "ferry" => "true"}}, []) == [
+               mode: ["TRAM", "SUBWAY", "FERRY"]
+             ]
     end
   end
 
@@ -349,9 +283,19 @@ defmodule Dotcom.TripPlan.QueryTest do
 
   describe "get_itineraries/1" do
     test "returns itineraries if present" do
-      itineraries = [%{}, %{}]
+      itineraries = [
+        %TripPlan.Itinerary{
+          start: Util.now(),
+          stop: Util.now()
+        },
+        %TripPlan.Itinerary{
+          start: Util.now(),
+          stop: Util.now()
+        }
+      ]
+
       query = %Query{itineraries: {:ok, itineraries}, from: nil, to: nil}
-      assert get_itineraries(query) == itineraries
+      assert ^itineraries = get_itineraries(query)
     end
 
     test "returns empty list if no itineraries" do
@@ -383,50 +327,13 @@ defmodule Dotcom.TripPlan.QueryTest do
     end
   end
 
-  describe "get_mode_opts/2" do
-    test "adds an empty list to opts if all modes are disabled" do
-      assert get_mode_opts(%{"subway" => "false", "bus" => "false"}, []) == [mode: []]
-    end
-
-    test "adds a list of specific modes if any modes are enabled" do
-      assert get_mode_opts(%{"subway" => "false", "bus" => "true", "commuter_rail" => "true"}, []) ==
-               [mode: ["RAIL", "BUS"]]
-
-      assert get_mode_opts(%{"subway" => "true", "ferry" => "true"}, []) == [
-               mode: ["TRAM", "SUBWAY", "FERRY"]
-             ]
-    end
-  end
-
-  describe "default_optimize_for/1" do
-    test "adds a default of best route for optimize" do
-      opts = %{"modes" => %{"bus" => "true"}}
-      assert Map.merge(opts, %{"optimize_for" => "best_route"}) == default_optimize_for(opts)
-    end
-  end
-
-  describe "default_mode/1" do
-    test "adds a default of modes" do
-      opts = %{"optimize_for" => "best_route"}
-
-      assert Map.merge(opts, %{
-               "modes" => %{
-                 "bus" => "true",
-                 "commuter_rail" => "true",
-                 "ferry" => "true",
-                 "subway" => "true"
-               }
-             }) == default_mode(opts)
-    end
-  end
-
   describe "get_query_options/1" do
-    test "keeps optimize_for if provided" do
-      opts = %{"optimize_for" => "accessibility"}
+    test "keeps wheelchair if provided" do
+      opts = %{"wheelchair" => "true"}
 
       assert [
                mode: ["TRAM", "SUBWAY", "FERRY", "RAIL", "BUS"],
-               wheelchair_accessible?: true
+               wheelchair: true
              ] == get_query_options(opts)
     end
 
diff --git a/test/dotcom/trip_plan/related_link_test.exs b/test/dotcom/trip_plan/related_link_test.exs
index d2eea9a75c..47da098355 100644
--- a/test/dotcom/trip_plan/related_link_test.exs
+++ b/test/dotcom/trip_plan/related_link_test.exs
@@ -2,14 +2,18 @@ defmodule Dotcom.TripPlan.RelatedLinkTest do
   use ExUnit.Case, async: true
   import Dotcom.TripPlan.RelatedLink
   import DotcomWeb.Router.Helpers, only: [fare_path: 4]
+  import Test.Support.Factory
   alias Routes.Route
-  alias TripPlan.{Itinerary, Api.MockPlanner}
+  alias TripPlan.Itinerary
+
+  setup_all do
+    itinerary =
+      build(:itinerary,
+        legs: [
+          build(:leg, mode: build(:transit_detail))
+        ]
+      )
 
-  setup do
-    from = MockPlanner.random_stop()
-    to = MockPlanner.random_stop()
-    connection_opts = [user_id: 1]
-    {:ok, [itinerary]} = TripPlan.plan(from, to, connection_opts, [])
     {:ok, %{itinerary: itinerary}}
   end
 
@@ -35,11 +39,14 @@ defmodule Dotcom.TripPlan.RelatedLinkTest do
     end
 
     test "returns a non-empty list for multiple kinds of itineraries" do
-      connection_opts = [user_id: 1]
-
       for _i <- 0..100 do
-        {:ok, [itinerary]} =
-          TripPlan.plan(MockPlanner.random_stop(), MockPlanner.random_stop(), connection_opts, [])
+        itinerary =
+          build(:itinerary,
+            legs: [
+              build(:leg, mode: build(:transit_detail)),
+              build(:leg, mode: build(:transit_detail))
+            ]
+          )
 
         assert [_ | _] = links_for_itinerary(itinerary)
       end
@@ -49,10 +56,12 @@ defmodule Dotcom.TripPlan.RelatedLinkTest do
       itinerary: itinerary
     } do
       for _i <- 0..10 do
-        itinerary =
-          itinerary
-          |> MockPlanner.add_transit_leg()
-          |> MockPlanner.add_transit_leg()
+        leg =
+          build(:leg, %{
+            mode: build(:transit_detail)
+          })
+
+        itinerary = %Itinerary{itinerary | legs: [leg | itinerary.legs]}
 
         links = links_for_itinerary(itinerary)
         # for each leg, we build the expected test along with the URL later, if
diff --git a/test/dotcom_web/controllers/trip_plan/feedback_test.exs b/test/dotcom_web/controllers/trip_plan/feedback_test.exs
new file mode 100644
index 0000000000..db41901841
--- /dev/null
+++ b/test/dotcom_web/controllers/trip_plan/feedback_test.exs
@@ -0,0 +1,56 @@
+defmodule DotcomWeb.TripPlan.FeedbackTest do
+  use DotcomWeb.ConnCase, async: true
+
+  alias DotcomWeb.TripPlan.Feedback
+
+  @arbitrary_data %{
+    "itinerary_index" => 2,
+    "generated_user_id" => "123",
+    "generated_time" => "2024-02-28T12:01:23",
+    "and_many_more" => [
+      %{"things" => "are in here"}
+    ]
+  }
+  @expected_cache_key "dotcomweb.tripplan.feedback|local|123|2024-02-28T12:01:23|2"
+
+  @bad_data %{
+    "incorrect" => "keys"
+  }
+
+  setup %{conn: conn} do
+    cache = Application.get_env(:dotcom, :trip_plan_feedback_cache)
+    cache.flush()
+    {:ok, %{conn: conn, cache: cache}}
+  end
+
+  describe "delete/2" do
+    test "returns 202 status and deletes from cache", %{conn: conn, cache: cache} do
+      cache.put(@expected_cache_key, :doesnt_matter_whats_here)
+      assert cache.get(@expected_cache_key)
+      conn = Feedback.delete(conn, @arbitrary_data)
+      refute cache.get(@expected_cache_key)
+      assert response(conn, 202)
+    end
+
+    test "doesn't work with invalid data", %{conn: conn} do
+      assert_raise FunctionClauseError, fn ->
+        Feedback.delete(conn, @bad_data)
+      end
+    end
+  end
+
+  describe "put/2" do
+    test "returns 202 status and caches the data", %{conn: conn, cache: cache} do
+      refute cache.get(@expected_cache_key)
+      conn = Feedback.put(conn, @arbitrary_data)
+      assert cache.get(@expected_cache_key)
+      assert response(conn, 202)
+    end
+
+    test "doesn't work with invalid data", %{conn: conn} do
+      assert_raise FunctionClauseError, fn ->
+        Feedback.put(conn, @bad_data)
+      end
+    end
+  end
+end
diff --git a/test/dotcom_web/controllers/trip_plan_controller_test.exs b/test/dotcom_web/controllers/trip_plan_controller_test.exs
index 3fd997f446..87b7190be0 100644
--- a/test/dotcom_web/controllers/trip_plan_controller_test.exs
+++ b/test/dotcom_web/controllers/trip_plan_controller_test.exs
@@ -3,10 +3,11 @@ defmodule DotcomWeb.TripPlanControllerTest do
   alias Fares.Fare
   alias Dotcom.TripPlan.Query
   alias DotcomWeb.TripPlanController
-  alias TripPlan.{Api.MockPlanner, Itinerary, PersonalDetail, TransitDetail}
+  alias TripPlan.{Itinerary, PersonalDetail, TransitDetail}
   doctest DotcomWeb.TripPlanController
 
   import Mock
+  import Mox
 
   @system_time "2017-01-01T12:20:00-05:00"
   @morning %{
@@ -43,7 +44,7 @@ defmodule DotcomWeb.TripPlanControllerTest do
       "date_time" => @afternoon,
       "time" => "depart",
       "modes" => @modes,
-      "optimize_for" => "best_route"
+      "wheelchair" => "true"
     }
   }
 
@@ -136,8 +137,15 @@ defmodule DotcomWeb.TripPlanControllerTest do
     stop: DateTime.from_unix!(0)
   }
 
+  setup :verify_on_exit!
+
   setup do
-    conn = default_conn() |> put_req_cookie("tp_redesign", "true")
+    stub_with(OpenTripPlannerClient.Mock, Test.Support.OpenTripPlannerClientStub)
+    :ok
+  end
+
+  setup do
+    conn = default_conn()
 
     end_of_rating =
       @system_time
@@ -253,28 +261,7 @@ defmodule DotcomWeb.TripPlanControllerTest do
       assert %Query{} = conn.assigns.query
     end
 
-    test "assigns.optimize_for defaults to best_route", %{conn: conn} do
-      params = %{
-        "date_time" => @system_time,
-        "plan" => %{
-          "from" => "Your current location",
-          "from_latitude" => "42.3428",
-          "from_longitude" => "-71.0857",
-          "to" => "to address",
-          "to_latitude" => "",
-          "to_longitude" => "",
-          "date_time" => @morning,
-          "modes" => @modes
-        }
-      }
-
-      conn = get(conn, trip_plan_path(conn, :index, params))
-
-      assert html_response(conn, 200) =~ "Trip Planner"
-      assert conn.assigns.optimize_for == "best_route"
-    end
-
-    test "assigns.optimize_for uses value provided in params", %{conn: conn} do
+    test "assigns.wheelchair uses value provided in params", %{conn: conn} do
       params = %{
         "date_time" => @system_time,
         "plan" => %{
@@ -286,14 +273,14 @@ defmodule DotcomWeb.TripPlanControllerTest do
           "to_longitude" => "",
           "date_time" => @morning,
           "modes" => @modes,
-          "optimize_for" => "less_walking"
+          "wheelchair" => "true"
         }
       }
 
       conn = get(conn, trip_plan_path(conn, :index, params))
 
       assert html_response(conn, 200) =~ "Trip Planner"
-      assert conn.assigns.optimize_for == "less_walking"
+      assert conn.assigns.wheelchair == true
     end
 
     test "can use the old date time format", %{conn: conn} do
@@ -715,31 +702,6 @@ defmodule DotcomWeb.TripPlanControllerTest do
       assert Map.get(conn.assigns, :plan_error) == []
       refute response =~ "Date is not valid"
     end
-
-    test "destination address has a checkmark in its stop bubble", %{conn: conn} do
-      params = %{
-        "date_time" => @system_time,
-        "plan" => %{"from" => "from address", "to" => "to address", "date_time" => @morning}
-      }
-
-      morning_conn = get(conn, trip_plan_path(conn, :index, params))
-      assert Enum.count(morning_conn.assigns.itinerary_row_lists) == 2
-
-      afternoon_conn =
-        get(
-          conn,
-          trip_plan_path(conn, :index, %{
-            params
-            | "plan" => %{
-                "from" => "from address",
-                "to" => "to address",
-                "date_time" => @afternoon
-              }
-          })
-        )
-
-      assert Enum.count(afternoon_conn.assigns.itinerary_row_lists) == 2
-    end
   end
 
   describe "/from/ address path" do
@@ -830,10 +792,7 @@ defmodule DotcomWeb.TripPlanControllerTest do
 
   describe "routes_for_query/1" do
     setup do
-      from = MockPlanner.random_stop()
-      to = MockPlanner.random_stop()
-      connection_opts = [user_id: 1]
-      {:ok, itineraries} = TripPlan.plan(from, to, connection_opts, [])
+      itineraries = Test.Support.Factory.build_list(3, :itinerary)
       {:ok, %{itineraries: itineraries}}
     end
 
diff --git a/test/dotcom_web/views/trip_plan_view_test.exs b/test/dotcom_web/views/trip_plan_view_test.exs
index 9987d6ca7c..16b74282e4 100644
--- a/test/dotcom_web/views/trip_plan_view_test.exs
+++ b/test/dotcom_web/views/trip_plan_view_test.exs
@@ -7,7 +7,7 @@ defmodule DotcomWeb.TripPlanViewTest do
   alias Fares.Fare
   alias Routes.Route
   alias Dotcom.TripPlan.{IntermediateStop, ItineraryRow, Query}
-  alias TripPlan.Api.MockPlanner
+  alias Test.Support.Factory
   alias TripPlan.{Itinerary, Leg, NamedPosition, TransitDetail}
 
   @highest_one_way_fare %Fares.Fare{
@@ -93,7 +93,7 @@ defmodule DotcomWeb.TripPlanViewTest do
       query = %{
         @base_explanation_query
         | time: {:depart_at, @date_time},
-          wheelchair_accessible?: true
+          wheelchair: true
       }
 
       selected = %{subway: true, bus: true, commuter_rail: true, ferry: true}
@@ -112,7 +112,7 @@ closest departure to 12:00 AM, Thursday, January 1st."
       query = %{
         @base_explanation_query
         | time: {:arrive_by, @date_time},
-          wheelchair_accessible?: false
+          wheelchair: false
       }
 
       selected = %{subway: true, bus: true, commuter_rail: true, ferry: true}
@@ -218,7 +218,7 @@ closest arrival to 12:00 AM, Thursday, January 1st."
     end
 
     test "renders an empty string if the query has a good value for the field", %{conn: conn} do
-      from = MockPlanner.random_stop()
+      from = Test.Support.Factory.build(:stop_named_position)
 
       query = %Query{
         from: {:ok, from},
@@ -611,8 +611,8 @@ closest arrival to 12:00 AM, Thursday, January 1st."
         %{
           @base_itinerary
           | legs: [
-              MockPlanner.personal_leg(nil, nil, nil, nil),
-              MockPlanner.personal_leg(nil, nil, nil, nil)
+              Test.Support.Factory.build(:leg, mode: Test.Support.Factory.build(:personal_detail)),
+              Test.Support.Factory.build(:leg, mode: Test.Support.Factory.build(:personal_detail))
             ]
         }
         |> transfer_note
@@ -625,9 +625,9 @@ closest arrival to 12:00 AM, Thursday, January 1st."
         %{
           @base_itinerary
           | legs: [
-              MockPlanner.personal_leg(nil, nil, nil, nil),
+              Test.Support.Factory.build(:leg, mode: Test.Support.Factory.build(:personal_detail)),
               @bus_leg,
-              MockPlanner.personal_leg(nil, nil, nil, nil)
+              Test.Support.Factory.build(:leg, mode: Test.Support.Factory.build(:personal_detail))
             ]
         }
         |> transfer_note
@@ -702,7 +702,7 @@ closest arrival to 12:00 AM, Thursday, January 1st."
       date_time: Util.now(),
       errors: [],
       modes: %{},
-      optimize_for: :best_route,
+      wheelchair: false,
       initial_map_data: Dotcom.TripPlan.Map.initial_map_data(),
       plan_datetime_selector_fields: plan_datetime_selector_fields
     }
@@ -736,6 +736,68 @@ closest arrival to 12:00 AM, Thursday, January 1st."
     end
   end
 
+  describe "trip_plan_metadata/1" do
+    test "returns a map repesenting the planned trip", %{conn: conn} do
+      assert result = trip_plan_metadata(conn)
+
+      assert %{
+               "generated_user_id" => _id,
+               "generated_time" => time,
+               "modes" => _modes,
+               "query" => _query
+             } = result
+
+      assert %DateTime{} = time
+    end
+
+    test "returns with encdoded %TripPlan.Query{}", %{conn: conn} do
+      conn =
+        assign(conn, :query, %Query{
+          from: Factory.build(:named_position),
+          to: Factory.build(:stop_named_position),
+          time: {:depart_at, Util.now()},
+          wheelchair: true,
+          itineraries: {:ok, Factory.build_list(3, :itinerary)}
+        })
+
+      assert %{
+               "query" => %{
+                 "errors" => errors,
+                 "from" => %{
+                   "latitude" => _,
+                   "longitude" => _,
+                   "name" => _,
+                   "stop_id" => _
+                 },
+                 "itineraries" => itineraries,
+                 "time_type" => "depart_at",
+                 "date_time" => dt,
+                 "to" => %{
+                   "latitude" => _,
+                   "longitude" => _,
+                   "name" => _,
+                   "stop_id" => _
+                 },
+                 "wheelchair" => true
+               }
+             } = trip_plan_metadata(conn)
+
+      assert errors == []
+      assert is_binary(dt)
+
+      assert [
+               %{
+                 "accessible?" => _,
+                 "legs" => _,
+                 "start" => _,
+                 "stop" => _,
+                 "tag" => _
+               }
+               | _
+             ] = itineraries
+    end
+  end
+
   describe "Fares logic" do
     @fares_assigns %{
       itinerary: %Itinerary{
diff --git a/test/support/factory.ex b/test/support/factory.ex
new file mode 100644
index 0000000000..8ee89b9c92
--- /dev/null
+++ b/test/support/factory.ex
@@ -0,0 +1,112 @@
+defmodule Test.Support.Factory do
+  @moduledoc """
+  Provides generated test data via ExMachina and Faker.
+  """
+  use ExMachina
+
+  alias TripPlan.{Itinerary, Leg, NamedPosition, PersonalDetail, TransitDetail}
+
+  def itinerary_factory do
+    start = Faker.DateTime.forward(1)
+
+    %Itinerary{
+      start: start,
+      stop: Faker.DateTime.between(start, Timex.shift(start, minutes: 75)),
+      legs: Faker.random_between(1, 4) |> build_list(:leg),
+      accessible?: Faker.Util.pick([true, false, nil])
+    }
+  end
+
+  def leg_factory do
+    start = Faker.DateTime.forward(1)
+    stop = Faker.DateTime.between(start, Timex.shift(start, minutes: 75))
+    from = Faker.Util.pick([build(:named_position), build(:stop_named_position)])
+    to = Faker.Util.pick([build(:named_position), build(:stop_named_position)])
+    mode = Faker.Util.pick([build(:personal_detail), build(:transit_detail)])
+
+    description =
+      case mode do
+        %TransitDetail{} ->
+          Faker.Util.pick(~w(BUS SUBWAY RAIL TRAM FERRY)a)
+
+        _ ->
+          "WALK"
+      end
+
+    %Leg{
+      start: start,
+      stop: stop,
+      from: from,
+      to: to,
+      mode: mode,
+      polyline: Faker.Lorem.characters(),
+      type: "MBTA",
+      url: "https://www.mbta.com",
+      description: description
+    }
+  end
+
+  def personal_detail_factory do
+    steps = Faker.random_between(1, 4) |> build_list(:step)
+
+    %PersonalDetail{
+      distance: Enum.map(steps, & &1.distance) |> Enum.sum(),
+      steps: steps
+    }
+  end
+
+  def step_factory do
+    %PersonalDetail.Step{
+      distance: Faker.random_uniform() * 1000,
+      relative_direction: Faker.Util.pick(~w(left right depart continue)a),
+      absolute_direction: Faker.Util.pick(~w(north east south west)a),
+      street_name: Faker.Address.street_name()
+    }
+  end
+
+  def transit_detail_factory do
+    route_id = Faker.Util.pick(~w(1 350 Blue Red)s)
+    schedules = Schedules.Repo.by_route_ids([route_id], stop_sequences: :first)
+    trip_id = List.first(schedules).trip.id
+
+    %TransitDetail{
+      route_id: route_id,
+      trip_id: trip_id,
+      intermediate_stop_ids:
+        Enum.random([
+          [List.first(schedules).stop.id],
+          []
+        ])
+    }
+  end
+
+  def stop_named_position_factory do
+    stop =
+      [
+        "place-sstat",
+        "place-north",
+        "place-bbsta",
+        "place-pktrm",
+        "place-rugg",
+        "place-gover"
+      ]
+      |> Faker.Util.pick()
+      |> Stops.Repo.get!()
+
+    %NamedPosition{
+      name: stop.name,
+      stop_id: stop.id,
+      latitude: stop.latitude,
+      longitude: stop.longitude
+    }
+  end
+
+  def named_position_factory do
+    %NamedPosition{
+      name: Faker.Address.city(),
+      stop_id: nil,
+      latitude: Faker.Address.latitude(),
+      longitude: Faker.Address.longitude()
+    }
+  end
+end
diff --git a/test/support/mocks/open_trip_planner_client_stub.ex b/test/support/mocks/open_trip_planner_client_stub.ex
new file mode 100644
index 0000000000..0997e24357
--- /dev/null
+++ b/test/support/mocks/open_trip_planner_client_stub.ex
@@ -0,0 +1,22 @@
+defmodule Test.Support.OpenTripPlannerClientStub do
+  @moduledoc """
+  An implementation of `OpenTripPlannerClient.Behaviour`.
+
+  Can be used in tests with
+  ```elixir
+  Mox.stub_with(OpenTripPlannerClient.Mock, Test.Support.OpenTripPlannerClientStub)
+  ```
+  """
+  @behaviour OpenTripPlannerClient.Behaviour
+
+  @impl OpenTripPlannerClient.Behaviour
+  def plan(from, to, opts) do
+    plan(from, to, opts, self())
+  end
+
+  def plan(from, to, opts, parent) do
+    itineraries = []
+    send(parent, {:planned_trip, {from, to, opts}, {:ok, itineraries}})
+    {:ok, itineraries}
+  end
+end
diff --git a/test/support/test_cache.ex b/test/support/test_cache.ex
index f1996cf389..25ad9b8c76 100644
--- a/test/support/test_cache.ex
+++ b/test/support/test_cache.ex
@@ -1,7 +1,7 @@
-defmodule CMS.TestCache do
+defmodule Dotcom.Cache.TestCache do
   @moduledoc """
   This local Nebulex instance allows us to run tests w/out the need for Redis.
   """
 
-  use Nebulex.Cache, otp_app: :cms, adapter: Nebulex.Adapters.Local
+  use Nebulex.Cache, otp_app: :dotcom, adapter: Nebulex.Adapters.Local
 end
diff --git a/test/test_helper.exs b/test/test_helper.exs
index 9b38d68584..a35e81c8a3 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -7,6 +7,11 @@ _ = Tzdata.ReleaseUpdater.poll_for_update()
 # Avoid starting unneeded background processing during tests
 System.put_env("USE_SERVER_SENT_EVENTS", "false")
 System.put_env("WARM_CACHES", "false")
+
+Application.ensure_all_started(:ex_machina)
+Application.ensure_all_started(:mox)
+Mox.defmock(OpenTripPlannerClient.Mock, for: OpenTripPlannerClient.Behaviour)
+
 # Ensure the deps are all started
 Application.ensure_all_started(:dotcom)
 ExUnit.start(capture_log: true)
diff --git a/test/trip_plan/api/open_trip_planner/builder_test.exs b/test/trip_plan/api/open_trip_planner/builder_test.exs
deleted file mode 100644
index 6dfeced44f..0000000000
--- a/test/trip_plan/api/open_trip_planner/builder_test.exs
+++ /dev/null
@@ -1,186 +0,0 @@
-defmodule TripPlan.Api.OpenTripPlanner.BuilderTest do
-  use ExUnit.Case, async: true
-  import TripPlan.Api.OpenTripPlanner.Builder
-
-  @from_inside %TripPlan.NamedPosition{
-    latitude: 42.356365,
-    longitude: -71.060920
-  }
-
-  @to_inside %TripPlan.NamedPosition{
-    latitude: 42.3636617,
-    longitude: -71.0832908
-  }
-
-  @from_stop %TripPlan.NamedPosition{
-    name: "FromStop",
-    stop_id: "From_Id"
-  }
-
-  @to_stop %TripPlan.NamedPosition{
-    name: "ToStop",
-    stop_id: "To_Id"
-  }
-
-  describe "build_params/1" do
-    test "depart_at sets date/time options" do
-      expected =
-        {:ok,
-         %{
-           "date" => "\"2017-05-22\"",
-           "time" => "\"12:04pm\"",
-           "arriveBy" => "false",
-           "walkReluctance" => 15,
-           "transportModes" => "[{mode: WALK}, {mode: TRANSIT}]",
-           "fromPlace" => "\"::42.356365,-71.06092\"",
-           "locale" => "\"en\"",
-           "toPlace" => "\"::42.3636617,-71.0832908\""
-         }}
-
-      actual =
-        build_params(
-          @from_inside,
-          @to_inside,
-          depart_at: DateTime.from_naive!(~N[2017-05-22T16:04:20], "Etc/UTC")
-        )
-
-      assert expected == actual
-    end
-
-    test "arrive_by sets date/time options" do
-      expected =
-        {:ok,
-         %{
-           "date" => "\"2017-05-22\"",
-           "time" => "\"12:04pm\"",
-           "arriveBy" => "true",
-           "walkReluctance" => 15,
-           "transportModes" => "[{mode: WALK}, {mode: TRANSIT}]",
-           "fromPlace" => "\"::42.356365,-71.06092\"",
-           "locale" => "\"en\"",
-           "toPlace" => "\"::42.3636617,-71.0832908\""
-         }}
-
-      actual =
-        build_params(
-          @from_inside,
-          @to_inside,
-          arrive_by: DateTime.from_naive!(~N[2017-05-22T16:04:20], "Etc/UTC")
-        )
-
-      assert expected == actual
-    end
-
-    test "wheelchair_accessible? sets wheelchair option" do
-      expected =
-        {:ok,
-         %{
-           "wheelchair" => "true",
-           "walkReluctance" => 15,
-           "transportModes" => "[{mode: WALK}, {mode: TRANSIT}]",
-           "fromPlace" => "\"::42.356365,-71.06092\"",
-           "locale" => "\"en\"",
-           "toPlace" => "\"::42.3636617,-71.0832908\""
-         }}
-
-      actual = build_params(@from_inside, @to_inside, wheelchair_accessible?: true)
-      assert expected == actual
-
-      expected =
-        {:ok,
-         %{
-           "walkReluctance" => 15,
-           "transportModes" => "[{mode: WALK}, {mode: TRANSIT}]",
-           "fromPlace" => "\"::42.356365,-71.06092\"",
-           "locale" => "\"en\"",
-           "toPlace" => "\"::42.3636617,-71.0832908\""
-         }}
-
-      actual = build_params(@from_inside, @to_inside, wheelchair_accessible?: false)
-      assert expected == actual
-    end
-
-    test ":mode defaults TRANSIT,WALK" do
-      expected =
-        {:ok,
-         %{
-           "walkReluctance" => 15,
-           "transportModes" => "[{mode: WALK}, {mode: TRANSIT}]",
-           "fromPlace" => "\"::42.356365,-71.06092\"",
-           "locale" => "\"en\"",
-           "toPlace" => "\"::42.3636617,-71.0832908\""
-         }}
-
-      actual = build_params(@from_inside, @to_inside, mode: [])
-      assert expected == actual
-    end
-
-    test ":mode builds a comma-separated list of modes to use" do
-      expected =
-        {:ok,
-         %{
-           "walkReluctance" => 15,
-           "transportModes" => "[{mode: BUS}, {mode: SUBWAY}, {mode: TRAM}, {mode: WALK}]",
-           "fromPlace" => "\"::42.356365,-71.06092\"",
-           "locale" => "\"en\"",
-           "toPlace" => "\"::42.3636617,-71.0832908\""
-         }}
-
-      actual = build_params(@from_inside, @to_inside, mode: ["BUS", "SUBWAY", "TRAM"])
-      assert expected == actual
-    end
-
-    test "optimize_for: :less_walking sets walkReluctance value" do
-      expected =
-        {:ok,
-         %{
-           "transportModes" => "[{mode: WALK}, {mode: TRANSIT}]",
-           "walkReluctance" => 27,
-           "fromPlace" => "\"::42.356365,-71.06092\"",
-           "locale" => "\"en\"",
-           "toPlace" => "\"::42.3636617,-71.0832908\""
-         }}
-
-      actual = build_params(@from_inside, @to_inside, optimize_for: :less_walking)
-      assert expected == actual
-    end
-
-    test "optimize_for: :fewest_transfers sets transferPenalty value" do
-      expected =
-        {:ok,
-         %{
-           "walkReluctance" => 15,
-           "transportModes" => "[{mode: WALK}, {mode: TRANSIT}]",
-           "transferPenalty" => 100,
-           "fromPlace" => "\"::42.356365,-71.06092\"",
-           "locale" => "\"en\"",
-           "toPlace" => "\"::42.3636617,-71.0832908\""
-         }}
-
-      actual = build_params(@from_inside, @to_inside, optimize_for: :fewest_transfers)
-      assert expected == actual
-    end
-
-    test "bad options return an error" do
-      expected = {:error, {:bad_param, {:bad, :arg}}}
-      actual = build_params(@from_inside, @to_inside, bad: :arg)
-      assert expected == actual
-    end
-
-    test "use stop id from to/from location" do
-      expected = {
-        :ok,
-        %{
-          "fromPlace" => "\"FromStop::mbta-ma-us:From_Id\"",
-          "toPlace" => "\"ToStop::mbta-ma-us:To_Id\"",
-          "locale" => "\"en\"",
-          "transportModes" => "[{mode: WALK}, {mode: TRANSIT}]",
-          "walkReluctance" => 15
-        }
-      }
-
-      actual = build_params(@from_stop, @to_stop, [])
-      assert expected == actual
-    end
-  end
-end
diff --git a/test/trip_plan/api/open_trip_planner/http_test.exs b/test/trip_plan/api/open_trip_planner/http_test.exs
deleted file mode 100644
index 25baa69592..0000000000
--- a/test/trip_plan/api/open_trip_planner/http_test.exs
+++ /dev/null
@@ -1,74 +0,0 @@
-defmodule TripPlan.Api.OpenTripPlanner.HttpTest do
-  @moduledoc """
-  Tests for OpenTripPlanner that require overriding the OTP host or making
-  external requests.
-
-  We pull these into a separate module so that the main body of tests can
-  remain async: true.
-
-  """
-  use ExUnit.Case
-  import TripPlan.Api.OpenTripPlanner
-  alias TripPlan.NamedPosition
-  import Plug.Conn, only: [send_resp: 3]
-
-  describe "plan/4" do
-    @describetag :external
-    @describetag :skip
-
-    test "can make a basic plan with OpenTripPlanner" do
-      # use a NamedPosition + a regular Position to test both kinds of location handling
-      north_station = %NamedPosition{
-        name: "North Station",
-        stop_id: "place-north",
-        latitude: 42.365551,
-        longitude: -71.061251
-      }
-
-      connection_opts = [user_id: 1]
-      boylston = {42.348777, -71.066481}
-
-      assert {:ok, itineraries} =
-               plan(north_station, boylston, connection_opts, depart_at: DateTime.utc_now())
-
-      refute itineraries == []
-    end
-  end
-
-  describe "error handling/logging" do
-    setup do
-      bypass = Bypass.open()
-      host = "http://localhost:#{bypass.port}"
-      old_config = Application.get_env(:dotcom, OpenTripPlanner)
-      old_level = Logger.level()
-
-      on_exit(fn ->
-        Application.put_env(:dotcom, OpenTripPlanner, old_config)
-        Logger.configure(level: old_level)
-      end)
-
-      new_config = put_in(old_config[:otp_url], host)
-      Application.put_env(:dotcom, OpenTripPlanner, new_config)
-      Logger.configure(level: :info)
-
-      {:ok, %{bypass: bypass, config: new_config}}
-    end
-
-    @tag :capture_log
-    test "HTTP errors are converted to error tuples", %{bypass: bypass} do
-      Bypass.expect(bypass, fn conn ->
-        send_resp(conn, 500, "{}")
-      end)
-
-      connection_opts = [user_id: 1]
-      assert {:error, _} = plan({1, 1}, {2, 2}, connection_opts, depart_at: DateTime.utc_now())
-    end
-
-    @tag :capture_log
-    test "connection errors are converted to error tuples", %{bypass: bypass} do
-      Bypass.down(bypass)
-      connection_opts = [user_id: 1]
-      assert {:error, _} = plan({1, 1}, {2, 2}, connection_opts, depart_at: DateTime.utc_now())
-    end
-  end
-end
diff --git a/test/trip_plan/api/open_trip_planner/parser_test.exs b/test/trip_plan/api/open_trip_planner/parser_test.exs
deleted file mode 100644
index a5a6622dc4..0000000000
--- a/test/trip_plan/api/open_trip_planner/parser_test.exs
+++ /dev/null
@@ -1,139 +0,0 @@
-defmodule TripPlan.Api.OpenTripPlanner.ParserTest do
-  use ExUnit.Case, async: true
-  import TripPlan.Api.OpenTripPlanner.Parser
-  alias TripPlan.{Itinerary, NamedPosition, PersonalDetail, PersonalDetail.Step, TransitDetail}
-
-  @fixture File.read!("test/trip_plan/fixture/north_station_to_park_plaza.json")
-  @parsed parse_json(@fixture)
-
-  describe "parse_json/1" do
-    test "returns an error with invalid JSON" do
-      assert {:error, :invalid, 0} = parse_json("")
-    end
-
-    test "returns a list of Itinerary structs" do
-      {:ok, parsed} = @parsed
-
-      for i <- parsed do
-        assert %Itinerary{} = i
-      end
-
-      assert [first, _, _] = parsed
-
-      is_equal_time? = fn t1, t2 ->
-        DateTime.compare(t1, t2) == :eq
-      end
-
-      assert is_equal_time?.(
-               first.start,
-               Timex.to_datetime(~N[2017-05-19T13:50:59], "America/New_York")
-             )
-
-      assert is_equal_time?.(
-               first.stop,
-               Timex.to_datetime(~N[2017-05-19T14:03:19], "America/New_York")
-             )
-    end
-
-    test "allows null absoluteDirection" do
-      pattern = "absoluteDirection\": \"SOUTH\""
-      replacement = "absoluteDirection\": null"
-      json = String.replace(@fixture, pattern, replacement)
-      assert {:ok, _itinerary} = parse_json(json)
-    end
-
-    test "returns an error if JSON is invalid" do
-      pattern = "absoluteDirection\": \"SOUTH\""
-      replacement = "absoluteDirection\": \"UP\""
-      json = String.replace(@fixture, pattern, replacement)
-      assert {:error, :invalid_json} = parse_json(json)
-    end
-
-    test "an itinerary has legs" do
-      {:ok, parsed} = @parsed
-      first = List.first(parsed)
-      [subway_leg, walk_leg] = first.legs
-
-      assert %TransitDetail{
-               route_id: "Orange",
-               trip_id: "33932853",
-               intermediate_stop_ids: ~w(70024 70022 70020 70018)s
-             } = subway_leg.mode
-
-      assert "Orange Line" = subway_leg.long_name
-      assert "1" = subway_leg.type
-      assert "http://www.mbta.com" = subway_leg.url
-      assert "SUBWAY" = subway_leg.description
-
-      assert %NamedPosition{stop_id: "70016"} = walk_leg.from
-      assert %NamedPosition{name: "Destination"} = walk_leg.to
-      assert is_binary(walk_leg.polyline)
-      assert %DateTime{} = walk_leg.start
-      assert %DateTime{} = walk_leg.stop
-      assert %PersonalDetail{} = walk_leg.mode
-    end
-
-    test "positions can use stopId instead of stopCode" do
-      {:ok, parsed} = @parsed
-      stop_code_regex = ~r/"stopCode": "[^"]",/
-      data = String.replace(@fixture, stop_code_regex, "")
-      {:ok, parsed_data} = parse_json(data)
-      assert parsed_data == parsed
-    end
-
-    test "walk legs have distance and step plans" do
-      {:ok, parsed} = @parsed
-      [_, walk_leg] = List.first(parsed).legs
-      assert walk_leg.mode.distance == 329.314
-
-      assert walk_leg.mode.steps == [
-               %Step{
-                 distance: 138.02,
-                 relative_direction: :depart,
-                 absolute_direction: :south,
-                 street_name: "Washington Street"
-               },
-               %Step{
-                 distance: 111.909,
-                 relative_direction: :right,
-                 absolute_direction: :west,
-                 street_name: "Oak Street West"
-               },
-               %Step{
-                 distance: 79.385,
-                 relative_direction: :continue,
-                 absolute_direction: :west,
-                 street_name: "Tremont Street"
-               }
-             ]
-    end
-
-    test "subway legs have trip information" do
-      {:ok, parsed} = @parsed
-      [subway_leg, _] = List.first(parsed).legs
-      assert subway_leg.mode.route_id == "Orange"
-      assert subway_leg.mode.trip_id == "33932853"
-      assert subway_leg.mode.intermediate_stop_ids == ~w(
-        70024
-        70022
-        70020
-        70018
-      )
-    end
-
-    test "parses path_not_found error as location_not_accessible when accessiblity is checked" do
-      decoded_json = %{"plan" => %{"routingErrors" => [%{"code" => "PATH_NOT_FOUND"}]}}
-
-      {:ok, json} = Poison.encode(decoded_json)
-      parsed_json = parse_json(json, true)
-      assert parsed_json == {:error, :location_not_accessible}
-    end
-
-    test "parses path_not_found error as normally when accessibility is not checked" do
-      decoded_json = %{"plan" => %{"routingErrors" => [%{"code" => "PATH_NOT_FOUND"}]}}
-      {:ok, json} = Poison.encode(decoded_json)
-      parsed_json = parse_json(json)
-      assert parsed_json == {:error, :path_not_found}
-    end
-  end
-end
diff --git a/test/trip_plan/api/open_trip_planner_test.exs b/test/trip_plan/api/open_trip_planner_test.exs
deleted file mode 100644
index 1388010c87..0000000000
--- a/test/trip_plan/api/open_trip_planner_test.exs
+++ /dev/null
@@ -1,59 +0,0 @@
-defmodule TripPlan.Api.OpenTripPlannerTest do
-  use ExUnit.Case, async: false
-  import TripPlan.Api.OpenTripPlanner
-  alias TripPlan.NamedPosition
-
-  import Plug.Conn, only: [send_resp: 3]
-  import Test.Support.EnvHelpers
-
-  setup _ do
-    bypass = Bypass.open()
-    {:ok, %{bypass: bypass, url: "http://localhost:#{bypass.port}"}}
-  end
-
-  describe "plan/5" do
-    test "calls plan/4 and drops pid arguments" do
-      connection_opts = [user_id: 1, force_otp1: false, force_otp2: false]
-
-      expected = {:error, {:bad_param, {:bad, :arg}}}
-      actual = plan({1, 1}, {2, 2}, connection_opts, [bad: :arg], self())
-      assert expected == actual
-    end
-  end
-
-  describe "plan/4" do
-    test "bad options returns an error" do
-      connection_opts = [user_id: 1]
-      expected = {:error, {:bad_param, {:bad, :arg}}}
-      actual = plan({1, 1}, {2, 2}, connection_opts, bad: :arg)
-      assert expected == actual
-    end
-  end
-
-  test "does not normally add wiremock headers", %{bypass: bypass, url: url} do
-    Bypass.expect(bypass, fn conn ->
-      assert List.keyfind(conn.req_headers, "x-wm-proxy-url", 0) == nil
-      send_resp(conn, 404, ~s({"body": {}}))
-    end)
-
-    connection_opts = [user_id: 1]
-    from = %NamedPosition{name: "a", latitude: "42.13", longitude: "12.12313"}
-    to = %NamedPosition{name: "b", latitude: "42.13", longitude: "12.12313"}
-    plan(from, to, connection_opts, root_url: url)
-  end
-
-  test "adds headers when WIREMOCK_PROXY=true via config", %{bypass: bypass, url: url} do
-    config = Application.get_env(:dotcom, OpenTripPlanner)
-    reassign_env(:dotcom, OpenTripPlanner, Keyword.merge(config, wiremock_proxy: "true"))
-
-    Bypass.expect(bypass, fn conn ->
-      assert List.keyfind(conn.req_headers, "x-wm-proxy-url", 0) != nil
-      send_resp(conn, 404, ~s({"body": {}}))
-    end)
-
-    connection_opts = [user_id: 1]
-    from = %NamedPosition{name: "a", latitude: "42.13", longitude: "12.12313"}
-    to = %NamedPosition{name: "b", latitude: "42.13", longitude: "12.12313"}
-    plan(from, to, connection_opts, root_url: url)
-  end
-end
diff --git a/test/trip_plan/fixture/north_station_to_park_plaza.json b/test/trip_plan/fixture/north_station_to_park_plaza.json
index 8516034d3f..eb0b29e22c 100644
--- a/test/trip_plan/fixture/north_station_to_park_plaza.json
+++ b/test/trip_plan/fixture/north_station_to_park_plaza.json
@@ -1,651 +1,1184 @@
 {
-    "requestParameters": {
-        "date": "05-19-2017",
-        "mode": "TRANSIT,WALK",
-        "arriveBy": "false",
-        "wheelchair": "true",
-        "showIntermediateStops": "true",
-        "fromPlace": "stop North Station ::42.365551,-71.061251",
-        "format": "json",
-        "toPlace": "42.348777,-71.066481",
-        "time": "1:46pm",
-        "maxWalkDistance": "804.672",
-        "locale": "en"
-    },
-    "plan": {
-        "date": 1495215960000,
-        "from": {
-            "name": "stop North Station ",
-            "lon": -71.061251,
-            "lat": 42.365551,
-            "orig": "stop North Station ",
-            "vertexType": "NORMAL"
-        },
-        "to": {
-            "name": "Destination",
-            "lon": -71.066481,
-            "lat": 42.348777,
-            "orig": "",
-            "vertexType": "NORMAL"
-        },
-        "itineraries": [{
-            "duration": 740,
-            "startTime": 1495216259000,
-            "endTime": 1495216999000,
-            "walkTime": 258,
-            "transitTime": 480,
-            "waitingTime": 2,
-            "walkDistance": 329.35159398374935,
-            "walkLimitExceeded": false,
-            "elevationLost": 0.0,
-            "elevationGained": 0.0,
-            "transfers": 0,
-            "legs": [{
-                "startTime": 1495216260000,
-                "endTime": 1495216740000,
-                "departureDelay": 0,
-                "arrivalDelay": 0,
-                "realTime": false,
-                "distance": 1995.478514770973,
-                "pathway": false,
-                "mode": "SUBWAY",
-                "route": {
-                    "gtfsId": "1:Orange",
-                    "longName": "Orange Line"
+    "data": {
+        "plan": {
+            "routingErrors": [],
+            "itineraries": [
+                {
+                    "accessibilityScore": 1,
+                    "startTime": 1706813160000,
+                    "endTime": 1706815000000,
+                    "duration": 1840,
+                    "legs": [
+                        {
+                            "mode": "WALK",
+                            "startTime": 1706813160000,
+                            "endTime": 1706815000000,
+                            "distance": 2214.18,
+                            "duration": 1840,
+                            "intermediateStops": null,
+                            "transitLeg": false,
+                            "headsign": null,
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": null,
+                            "alerts": [],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "North Station",
+                                "lat": 42.36528,
+                                "lon": -71.060205,
+                                "departureTime": 1706813160000,
+                                "arrivalTime": 1706813160000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70205"
+                                }
+                            },
+                            "to": {
+                                "name": "Park Plaza",
+                                "lat": 42.348777,
+                                "lon": -71.066481,
+                                "departureTime": 1706815000000,
+                                "arrivalTime": 1706815000000,
+                                "stop": null
+                            },
+                            "route": null,
+                            "trip": null,
+                            "steps": [
+                                {
+                                    "distance": 135.06,
+                                    "streetName": "path",
+                                    "lat": 42.365273,
+                                    "lon": -71.0602162,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "DEPART",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 171.32,
+                                    "streetName": "Valenti Way",
+                                    "lat": 42.36439,
+                                    "lon": -71.0598176,
+                                    "absoluteDirection": "SOUTHWEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 46.49,
+                                    "streetName": "Merrimac Street",
+                                    "lat": 42.3633781,
+                                    "lon": -71.061373,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 173.38,
+                                    "streetName": "path",
+                                    "lat": 42.3635175,
+                                    "lon": -71.0619065,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 129.27,
+                                    "streetName": "New Chardon Street",
+                                    "lat": 42.3622194,
+                                    "lon": -71.0622102,
+                                    "absoluteDirection": "SOUTHWEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 367.72,
+                                    "streetName": "Bowdoin Street",
+                                    "lat": 42.3611913,
+                                    "lon": -71.0628793,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "CONTINUE",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 29.18,
+                                    "streetName": "Beacon Street",
+                                    "lat": 42.3579049,
+                                    "lon": -71.0627487,
+                                    "absoluteDirection": "SOUTHWEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 164.93,
+                                    "streetName": "path",
+                                    "lat": 42.3577792,
+                                    "lon": -71.0630605,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 13.12,
+                                    "streetName": "Park Street",
+                                    "lat": 42.3566026,
+                                    "lon": -71.0620827,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 676.37,
+                                    "streetName": "Tremont Street",
+                                    "lat": 42.356511,
+                                    "lon": -71.061982,
+                                    "absoluteDirection": "SOUTHWEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 11.88,
+                                    "streetName": "path",
+                                    "lat": 42.3509454,
+                                    "lon": -71.0649625,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 181.29,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3509172,
+                                    "lon": -71.065102,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 114.15,
+                                    "streetName": "path",
+                                    "lat": 42.3493161,
+                                    "lon": -71.0655133,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                }
+                            ],
+                            "legGeometry": {
+                                "points": "_nqaGh}upL@@zBkC@Bf@bAHKHLFNx@zADHFHr@tAFHDLBBNZHNPJ[hBFBlA`@@@t@X`A\\BBB@@DBB@DBJL[DM@AHW??DFRTLNFFFDFFHFJDf@XFBHBB@D@@@@@B?B@B?@@B?D@B?D@D?B?@?B@D?B?D?B?D?T?\\A|BCR?vAALAH@RBH@~@BP?B?V?PADAHAHAlB]B?B?FBFBX~@DGBFDAh@a@DEROhAiA~@eA@A@A?CFLPSd@h@JJp@r@|@~@FH\\^b@^NJBBJHTNx@`@B@pAh@LD\\N\\Lp@TPFD@\\JLD~@XB@h@H`@H^FF@PDNBz@Nt@LLBTDH@PDh@JTHZFDZt@ND@B?|@RD?F@VFr@JfBT?FBJDPHPFNFJBLBJ@L?P?TVBDBP?BAJT"
+                            }
+                        }
+                    ]
                 },
-                "trip": {
-                    "gtfsId": "1:33932853"
+                {
+                    "accessibilityScore": 1,
+                    "startTime": 1706813400000,
+                    "endTime": 1706814466000,
+                    "duration": 1066,
+                    "legs": [
+                        {
+                            "mode": "SUBWAY",
+                            "startTime": 1706813400000,
+                            "endTime": 1706813760000,
+                            "distance": 1611.49,
+                            "duration": 360,
+                            "intermediateStops": [
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMDI0",
+                                    "gtfsId": "mbta-ma-us:70024",
+                                    "name": "Haymarket",
+                                    "desc": "Haymarket - Orange Line - Forest Hills",
+                                    "lat": 42.363021,
+                                    "lon": -71.05829,
+                                    "code": "70024",
+                                    "locationType": "STOP"
+                                },
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMDIy",
+                                    "gtfsId": "mbta-ma-us:70022",
+                                    "name": "State",
+                                    "desc": "State - Orange Line - Forest Hills",
+                                    "lat": 42.358978,
+                                    "lon": -71.057598,
+                                    "code": "70022",
+                                    "locationType": "STOP"
+                                },
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMDIw",
+                                    "gtfsId": "mbta-ma-us:70020",
+                                    "name": "Downtown Crossing",
+                                    "desc": "Downtown Crossing - Orange Line - Forest Hills",
+                                    "lat": 42.355518,
+                                    "lon": -71.060225,
+                                    "code": "70020",
+                                    "locationType": "STOP"
+                                }
+                            ],
+                            "transitLeg": true,
+                            "headsign": "Forest Hills",
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": {
+                                "gtfsId": "mbta-ma-us:1",
+                                "name": "MBTA",
+                                "url": "http://www.mbta.com"
+                            },
+                            "alerts": [
+                                {
+                                    "id": "QWxlcnQ6bWJ0YS1tYS11czo1NDgzNjY",
+                                    "alertHeaderText": "State Elevator 974 (Bowdoin platform to Congress Street, 60 State Street) unavailable",
+                                    "alertDescriptionText": "To exit, travel down the nearby ramp to the Orange Line Oak Grove platform, turn left, then use State Elevator 967 or 802 to access the Wonderland platform. Continue along the Wonderland platform to the 53 State St lobby and use State Elevator 975 to access the street. To board, cross State St, then proceed to the station entrance at 53 State St and use State Elevator 975 to access the Wonderland platform. At the Wonderland platform, turn left and proceed to the end of the platform (follow signs for Orange Line and Government Center/Bowdoin) and use State Elevator 967 or 802 to access the Orange Line Oak Grove platform. At the Oak Grove platform, turn right and travel up the nearby ramp to the Blue Line Bowdoin platform."
+                                }
+                            ],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "North Station",
+                                "lat": 42.36528,
+                                "lon": -71.060205,
+                                "departureTime": 1706813400000,
+                                "arrivalTime": 1706813400000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70026"
+                                }
+                            },
+                            "to": {
+                                "name": "Chinatown",
+                                "lat": 42.352547,
+                                "lon": -71.062752,
+                                "departureTime": 1706813760000,
+                                "arrivalTime": 1706813760000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70018"
+                                }
+                            },
+                            "route": {
+                                "gtfsId": "mbta-ma-us:Orange",
+                                "longName": "Orange Line",
+                                "shortName": null,
+                                "desc": "Rapid Transit",
+                                "color": "ED8B00",
+                                "textColor": "FFFFFF"
+                            },
+                            "trip": {
+                                "gtfsId": "mbta-ma-us:60455419"
+                            },
+                            "steps": [],
+                            "legGeometry": {
+                                "points": "inqaGr|upLdFcE`CuCh@g@b@W??FC??ZQr@GlMg@zG@????R?vC?P@TN`ElDvAvBdBrBrA|A???@@@t@r@hAtAjDdDb@d@t@r@TJj@Lj@@l@Bz@H@?"
+                            }
+                        },
+                        {
+                            "mode": "WALK",
+                            "startTime": 1706813760000,
+                            "endTime": 1706814466000,
+                            "distance": 663.55,
+                            "duration": 706,
+                            "intermediateStops": null,
+                            "transitLeg": false,
+                            "headsign": null,
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": null,
+                            "alerts": [],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "Chinatown",
+                                "lat": 42.352547,
+                                "lon": -71.062752,
+                                "departureTime": 1706813760000,
+                                "arrivalTime": 1706813760000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70018"
+                                }
+                            },
+                            "to": {
+                                "name": "Park Plaza",
+                                "lat": 42.348777,
+                                "lon": -71.066481,
+                                "departureTime": 1706814466000,
+                                "arrivalTime": 1706814466000,
+                                "stop": null
+                            },
+                            "route": null,
+                            "trip": null,
+                            "steps": [
+                                {
+                                    "distance": 37.8,
+                                    "streetName": "Washington Street, Essex Street, Silver Line - SL4/SL5",
+                                    "lat": 42.352547,
+                                    "lon": -71.062752,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "FOLLOW_SIGNS",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 0,
+                                    "streetName": "pathway",
+                                    "lat": 42.352547,
+                                    "lon": -71.062752,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "CONTINUE",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 31.24,
+                                    "streetName": "Elevator",
+                                    "lat": 42.352547,
+                                    "lon": -71.062752,
+                                    "absoluteDirection": "SOUTHWEST",
+                                    "relativeDirection": "FOLLOW_SIGNS",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 0,
+                                    "streetName": "pathway",
+                                    "lat": 42.352456,
+                                    "lon": -71.062935,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 0,
+                                    "streetName": "Chinatown - Washington St, Essex St",
+                                    "lat": 42.352405,
+                                    "lon": -71.063087,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "EXIT_STATION",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 21.24,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3523918,
+                                    "lon": -71.0630844,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 5.15,
+                                    "streetName": "alley",
+                                    "lat": 42.352366,
+                                    "lon": -71.0633404,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 66.2,
+                                    "streetName": "Boylston Street",
+                                    "lat": 42.3523198,
+                                    "lon": -71.0633365,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 5.56,
+                                    "streetName": "Tamworth Street",
+                                    "lat": 42.3523286,
+                                    "lon": -71.064141,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 26.87,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3522791,
+                                    "lon": -71.0641506,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 2.23,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3522948,
+                                    "lon": -71.0644769,
+                                    "absoluteDirection": "SOUTHWEST",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 6.77,
+                                    "streetName": "path",
+                                    "lat": 42.3522808,
+                                    "lon": -71.0644964,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 153.18,
+                                    "streetName": "Tremont Street",
+                                    "lat": 42.3522924,
+                                    "lon": -71.0645773,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 11.88,
+                                    "streetName": "path",
+                                    "lat": 42.3509454,
+                                    "lon": -71.0649625,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 181.29,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3509172,
+                                    "lon": -71.065102,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 114.15,
+                                    "streetName": "path",
+                                    "lat": 42.3493161,
+                                    "lon": -71.0655133,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                }
+                            ],
+                            "legGeometry": {
+                                "points": "k~naGfmvpL????Pb@????H\\????@?Bb@@NHA@^Ad@?NAZ?n@H@C~@@BANz@Nt@LLBTDH@PDh@JTHZFDZt@ND@B?|@RD?F@VFr@JfBT?FBJDPHPFNFJBLBJ@L?P?TVBDBP?BAJT"
+                            }
+                        }
+                    ]
                 },
-                "agencyName": "MBTA",
-                "agencyUrl": "http://www.mbta.com",
-                "agencyTimeZoneOffset": -14400000,
-                "routeColor": "E87200",
-                "routeType": 1,
-                "routeId": "1:Orange",
-                "routeTextColor": "FFFFFF",
-                "interlineWithPreviousLeg": false,
-                "tripBlockId": "O903_-12",
-                "headsign": "Forest Hills",
-                "agencyId": "1",
-                "serviceDate": "20170519",
-                "from": {
-                    "name": "North Station - Orange Line Inbound",
-                    "stopId": "1:70026",
-                    "stopCode": "70026",
-                    "lon": -71.06129,
-                    "lat": 42.365577,
-                    "departure": 1495216260000,
-                    "orig": "stop North Station ",
-                    "stopIndex": 6,
-                    "stopSequence": 60,
-                    "vertexType": "TRANSIT"
+                {
+                    "accessibilityScore": 1,
+                    "startTime": 1706813460000,
+                    "endTime": 1706814842000,
+                    "duration": 1382,
+                    "legs": [
+                        {
+                            "mode": "TRAM",
+                            "startTime": 1706813460000,
+                            "endTime": 1706813880000,
+                            "distance": 1163.77,
+                            "duration": 420,
+                            "intermediateStops": [
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMjA0",
+                                    "gtfsId": "mbta-ma-us:70204",
+                                    "name": "Haymarket",
+                                    "desc": "Haymarket - Green Line - Copley & West",
+                                    "lat": 42.363021,
+                                    "lon": -71.05829,
+                                    "code": "70204",
+                                    "locationType": "STOP"
+                                },
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMjAy",
+                                    "gtfsId": "mbta-ma-us:70202",
+                                    "name": "Government Center",
+                                    "desc": "Government Center - Green Line - Copley & West",
+                                    "lat": 42.359705,
+                                    "lon": -71.059215,
+                                    "code": "70202",
+                                    "locationType": "STOP"
+                                }
+                            ],
+                            "transitLeg": true,
+                            "headsign": "Riverside",
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": {
+                                "gtfsId": "mbta-ma-us:1",
+                                "name": "MBTA",
+                                "url": "http://www.mbta.com"
+                            },
+                            "alerts": [],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "North Station",
+                                "lat": 42.36528,
+                                "lon": -71.060205,
+                                "departureTime": 1706813460000,
+                                "arrivalTime": 1706813460000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70206"
+                                }
+                            },
+                            "to": {
+                                "name": "Park Street",
+                                "lat": 42.356395,
+                                "lon": -71.062424,
+                                "departureTime": 1706813880000,
+                                "arrivalTime": 1706813880000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70198"
+                                }
+                            },
+                            "route": {
+                                "gtfsId": "mbta-ma-us:Green-D",
+                                "longName": "Green Line D",
+                                "shortName": "D",
+                                "desc": "Rapid Transit",
+                                "color": "00843D",
+                                "textColor": "FFFFFF"
+                            },
+                            "trip": {
+                                "gtfsId": "mbta-ma-us:60564721"
+                            },
+                            "steps": [],
+                            "legGeometry": {
+                                "points": "{mqaGp}upL~FeFvAaBNSh@a@JIZQ??@?LITEXC`@GbGSd@CTBVNrE|DXV??VTRPRPXTZTbElCt@r@vB|Bl@t@b@b@TRTVp@|@HJ"
+                            }
+                        },
+                        {
+                            "mode": "WALK",
+                            "startTime": 1706813880000,
+                            "endTime": 1706814842000,
+                            "distance": 995.92,
+                            "duration": 962,
+                            "intermediateStops": null,
+                            "transitLeg": false,
+                            "headsign": null,
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": null,
+                            "alerts": [],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "Park Street",
+                                "lat": 42.356395,
+                                "lon": -71.062424,
+                                "departureTime": 1706813880000,
+                                "arrivalTime": 1706813880000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70198"
+                                }
+                            },
+                            "to": {
+                                "name": "Park Plaza",
+                                "lat": 42.348777,
+                                "lon": -71.066481,
+                                "departureTime": 1706814842000,
+                                "arrivalTime": 1706814842000,
+                                "stop": null
+                            },
+                            "route": null,
+                            "trip": null,
+                            "steps": [
+                                {
+                                    "distance": 26.06,
+                                    "streetName": "Park St, Boston Common",
+                                    "lat": 42.356395,
+                                    "lon": -71.062424,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "FOLLOW_SIGNS",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 7.47,
+                                    "streetName": "pathway",
+                                    "lat": 42.356395,
+                                    "lon": -71.062424,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "CONTINUE",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 0,
+                                    "streetName": "Park Street - Elevator, Tremont St",
+                                    "lat": 42.356331,
+                                    "lon": -71.062675,
+                                    "absoluteDirection": "NORTHEAST",
+                                    "relativeDirection": "EXIT_STATION",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 11.72,
+                                    "streetName": "path",
+                                    "lat": 42.3563361,
+                                    "lon": -71.0626702,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 132.7,
+                                    "streetName": "Lafayette Mall",
+                                    "lat": 42.3563207,
+                                    "lon": -71.0625398,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 356.45,
+                                    "streetName": "path",
+                                    "lat": 42.3553359,
+                                    "lon": -71.0634118,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 3.29,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3523266,
+                                    "lon": -71.0646874,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 125.23,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.352305,
+                                    "lon": -71.064666,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 5.89,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3512007,
+                                    "lon": -71.0649653,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 212.98,
+                                    "streetName": "path",
+                                    "lat": 42.3511902,
+                                    "lon": -71.0650356,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 114.15,
+                                    "streetName": "path",
+                                    "lat": 42.3493161,
+                                    "lon": -71.0655133,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                }
+                            ],
+                            "legGeometry": {
+                                "points": "mvoaGdkvpL????Ft@????BC??????BKAOXBd@f@FDb@d@NP|@x@JJDKNLRHhChArAj@lBp@l@Nj@NvAVNJL@F@J@?A@A@?~B`@|@PPB??JB@LTDXJFCt@ND@B?|@RD?F@VFr@JfBT?FBJDPHPFNFJBLBJ@L?P?TVBDBP?BAJT"
+                            }
+                        }
+                    ]
                 },
-                "to": {
-                    "name": "Tufts Medical Center - Outbound",
-                    "stop": {
-                        "gtfsId": "1:70016"
-                    },
-                    "lon": -71.063917,
-                    "lat": 42.349662,
-                    "arrival": 1495216740000,
-                    "departure": 1495216741000,
-                    "stopIndex": 11,
-                    "stopSequence": 110,
-                    "vertexType": "TRANSIT"
+                {
+                    "accessibilityScore": 1,
+                    "startTime": 1706813580000,
+                    "endTime": 1706814995000,
+                    "duration": 1415,
+                    "legs": [
+                        {
+                            "mode": "TRAM",
+                            "startTime": 1706813580000,
+                            "endTime": 1706814000000,
+                            "distance": 1163.77,
+                            "duration": 420,
+                            "intermediateStops": [
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMjA0",
+                                    "gtfsId": "mbta-ma-us:70204",
+                                    "name": "Haymarket",
+                                    "desc": "Haymarket - Green Line - Copley & West",
+                                    "lat": 42.363021,
+                                    "lon": -71.05829,
+                                    "code": "70204",
+                                    "locationType": "STOP"
+                                },
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMjAy",
+                                    "gtfsId": "mbta-ma-us:70202",
+                                    "name": "Government Center",
+                                    "desc": "Government Center - Green Line - Copley & West",
+                                    "lat": 42.359705,
+                                    "lon": -71.059215,
+                                    "code": "70202",
+                                    "locationType": "STOP"
+                                }
+                            ],
+                            "transitLeg": true,
+                            "headsign": "Heath Street",
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": {
+                                "gtfsId": "mbta-ma-us:1",
+                                "name": "MBTA",
+                                "url": "http://www.mbta.com"
+                            },
+                            "alerts": [],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "North Station",
+                                "lat": 42.36528,
+                                "lon": -71.060205,
+                                "departureTime": 1706813580000,
+                                "arrivalTime": 1706813580000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70206"
+                                }
+                            },
+                            "to": {
+                                "name": "Park Street",
+                                "lat": 42.356395,
+                                "lon": -71.062424,
+                                "departureTime": 1706814000000,
+                                "arrivalTime": 1706814000000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70199"
+                                }
+                            },
+                            "route": {
+                                "gtfsId": "mbta-ma-us:Green-E",
+                                "longName": "Green Line E",
+                                "shortName": "E",
+                                "desc": "Rapid Transit",
+                                "color": "00843D",
+                                "textColor": "FFFFFF"
+                            },
+                            "trip": {
+                                "gtfsId": "mbta-ma-us:60564790"
+                            },
+                            "steps": [],
+                            "legGeometry": {
+                                "points": "{mqaGp}upL~FeFvAaBNSh@a@JIZQ??@?LITEXC`@GbGSd@CTBVNrE|DXV??VTRPRPXTZTbElCt@r@vB|Bl@t@b@b@TRTVp@|@HJ"
+                            }
+                        },
+                        {
+                            "mode": "WALK",
+                            "startTime": 1706814000000,
+                            "endTime": 1706814995000,
+                            "distance": 1039.81,
+                            "duration": 995,
+                            "intermediateStops": null,
+                            "transitLeg": false,
+                            "headsign": null,
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": null,
+                            "alerts": [],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "Park Street",
+                                "lat": 42.356395,
+                                "lon": -71.062424,
+                                "departureTime": 1706814000000,
+                                "arrivalTime": 1706814000000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70199"
+                                }
+                            },
+                            "to": {
+                                "name": "Park Plaza",
+                                "lat": 42.348777,
+                                "lon": -71.066481,
+                                "departureTime": 1706814995000,
+                                "arrivalTime": 1706814995000,
+                                "stop": null
+                            },
+                            "route": null,
+                            "trip": null,
+                            "steps": [
+                                {
+                                    "distance": 69.95,
+                                    "streetName": "Park St, Boston Common",
+                                    "lat": 42.356395,
+                                    "lon": -71.062424,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "FOLLOW_SIGNS",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 7.47,
+                                    "streetName": "pathway",
+                                    "lat": 42.356395,
+                                    "lon": -71.062424,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "CONTINUE",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 0,
+                                    "streetName": "Park Street - Elevator, Tremont St",
+                                    "lat": 42.356331,
+                                    "lon": -71.062675,
+                                    "absoluteDirection": "NORTHEAST",
+                                    "relativeDirection": "EXIT_STATION",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 11.72,
+                                    "streetName": "path",
+                                    "lat": 42.3563361,
+                                    "lon": -71.0626702,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 132.7,
+                                    "streetName": "Lafayette Mall",
+                                    "lat": 42.3563207,
+                                    "lon": -71.0625398,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 356.45,
+                                    "streetName": "path",
+                                    "lat": 42.3553359,
+                                    "lon": -71.0634118,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 3.29,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3523266,
+                                    "lon": -71.0646874,
+                                    "absoluteDirection": "SOUTHEAST",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 125.23,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.352305,
+                                    "lon": -71.064666,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 5.89,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3512007,
+                                    "lon": -71.0649653,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 212.98,
+                                    "streetName": "path",
+                                    "lat": 42.3511902,
+                                    "lon": -71.0650356,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 114.15,
+                                    "streetName": "path",
+                                    "lat": 42.3493161,
+                                    "lon": -71.0655133,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                }
+                            ],
+                            "legGeometry": {
+                                "points": "mvoaGdkvpL????Ft@????BC??????BKAOXBd@f@FDb@d@NP|@x@JJDKNLRHhChArAj@lBp@l@Nj@NvAVNJL@F@J@?A@A@?~B`@|@PPB??JB@LTDXJFCt@ND@B?|@RD?F@VFr@JfBT?FBJDPHPFNFJBLBJ@L?P?TVBDBP?BAJT"
+                            }
+                        }
+                    ]
                 },
-                "legGeometry": {
-                    "points": "_rqaGz_vpLPOROtHkG`CuCh@g@b@W??FCZQr@GlMg@zG@??R?vC?P@TN`ElDvAvBdBrBrA~A??@@t@r@hAtAjDdDb@d@t@r@TJj@Lj@@l@Bz@H@?P@fD`@|B^XJRLx@`AzBvB^F",
-                    "length": 43
-                },
-                "routeLongName": "Orange Line",
-                "rentedBike": false,
-                "transitLeg": true,
-                "duration": 480.0,
-                "intermediateStops": [{
-                    "name": "Haymarket - Orange Line Inbound",
-                    "gtfsId": "1:70024",
-                    "stopCode": "70024",
-                    "lon": -71.05829,
-                    "lat": 42.363021,
-                    "arrival": 1495216320000,
-                    "departure": 1495216320000,
-                    "stopIndex": 7,
-                    "stopSequence": 70,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "State Street - to Forest Hills",
-                    "gtfsId": "1:70022",
-                    "stopCode": "70022",
-                    "lon": -71.057598,
-                    "lat": 42.358978,
-                    "arrival": 1495216440000,
-                    "departure": 1495216440000,
-                    "stopIndex": 8,
-                    "stopSequence": 80,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "Downtown Crossing - to Forest Hills",
-                    "gtfsId": "1:70020",
-                    "stopCode": "70020",
-                    "lon": -71.060225,
-                    "lat": 42.355518000000004,
-                    "arrival": 1495216560000,
-                    "departure": 1495216560000,
-                    "stopIndex": 9,
-                    "stopSequence": 90,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "Chinatown - Outbound",
-                    "gtfsId": "1:70018",
-                    "stopCode": "70018",
-                    "lon": -71.062752,
-                    "lat": 42.352547,
-                    "arrival": 1495216680000,
-                    "departure": 1495216680000,
-                    "stopIndex": 10,
-                    "stopSequence": 100,
-                    "vertexType": "TRANSIT"
-                }],
-                "steps": []
-            }, {
-                "startTime": 1495216741000,
-                "endTime": 1495216999000,
-                "departureDelay": 0,
-                "arrivalDelay": 0,
-                "realTime": false,
-                "distance": 329.314,
-                "pathway": false,
-                "mode": "WALK",
-                "route": {
-                    "gtfsId": "1:Orange",
-                    "longName": "Orange Line"
-                },
-                "trip": {
-                    "gtfsId": "1:33932852"
-                },
-                "agencyTimeZoneOffset": -14400000,
-                "interlineWithPreviousLeg": false,
-                "from": {
-                    "name": "Tufts Medical Center - Outbound",
-                    "stop": {
-                        "gtfsId": "1:70016"
-                    },
-                    "lon": -71.063917,
-                    "lat": 42.349662,
-                    "arrival": 1495216740000,
-                    "departure": 1495216741000,
-                    "stopIndex": 11,
-                    "stopSequence": 110,
-                    "vertexType": "TRANSIT"
-                },
-                "to": {
-                    "name": "Destination",
-                    "lon": -71.066481,
-                    "lat": 42.348777,
-                    "arrival": 1495216999000,
-                    "orig": "",
-                    "vertexType": "NORMAL"
-                },
-                "legGeometry": {
-                    "points": "clnaGvsvpL@?ZNF@\\Jr@NdB\\PDARa@vF[zD",
-                    "length": 11
-                },
-                "rentedBike": false,
-                "transitLeg": false,
-                "duration": 258.0,
-                "intermediateStops": [],
-                "steps": [{
-                    "distance": 138.02,
-                    "relativeDirection": "DEPART",
-                    "streetName": "Washington Street",
-                    "absoluteDirection": "SOUTH",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.06379006319844,
-                    "lat": 42.34962271200275,
-                    "elevation": []
-                }, {
-                    "distance": 111.909,
-                    "relativeDirection": "RIGHT",
-                    "streetName": "Oak Street West",
-                    "absoluteDirection": "WEST",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.064203,
-                    "lat": 42.348421800000004,
-                    "elevation": []
-                }, {
-                    "distance": 79.385,
-                    "relativeDirection": "CONTINUE",
-                    "streetName": "Tremont Street",
-                    "absoluteDirection": "WEST",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.06554100000001,
-                    "lat": 42.348609,
-                    "elevation": []
-                }]
-            }],
-            "tooSloped": false
-        }, {
-            "duration": 800,
-            "startTime": 1495216739000,
-            "endTime": 1495217539000,
-            "walkTime": 258,
-            "transitTime": 540,
-            "waitingTime": 2,
-            "walkDistance": 329.35159398374935,
-            "walkLimitExceeded": false,
-            "elevationLost": 0.0,
-            "elevationGained": 0.0,
-            "transfers": 0,
-            "legs": [{
-                "startTime": 1495216740000,
-                "endTime": 1495217280000,
-                "departureDelay": 0,
-                "arrivalDelay": 0,
-                "realTime": false,
-                "distance": 1995.478514770973,
-                "pathway": false,
-                "mode": "SUBWAY",
-                "route": {
-                    "gtfsId": "1:Orange",
-                    "longName": "Orange Line"
-                },
-                "trip": {
-                    "gtfsId": "1:33932854"
-                },
-                "agencyName": "MBTA",
-                "agencyUrl": "http://www.mbta.com",
-                "agencyTimeZoneOffset": -14400000,
-                "routeColor": "E87200",
-                "routeType": 1,
-                "routeId": "1:Orange",
-                "routeTextColor": "FFFFFF",
-                "interlineWithPreviousLeg": false,
-                "tripBlockId": "O903_-13",
-                "headsign": "Forest Hills",
-                "agencyId": "1",
-                "tripId": "1:33932854",
-                "serviceDate": "20170519",
-                "from": {
-                    "name": "North Station - Orange Line Inbound",
-                    "stopId": "1:70026",
-                    "stopCode": "70026",
-                    "lon": -71.06129,
-                    "lat": 42.365577,
-                    "departure": 1495216740000,
-                    "orig": "stop North Station ",
-                    "stopIndex": 6,
-                    "stopSequence": 60,
-                    "vertexType": "TRANSIT"
-                },
-                "to": {
-                    "name": "Tufts Medical Center - Outbound",
-                    "stop": {
-                        "gtfsId": "1:70016"
-                    },
-                    "lon": -71.063917,
-                    "lat": 42.349662,
-                    "arrival": 1495217280000,
-                    "departure": 1495217281000,
-                    "stopIndex": 11,
-                    "stopSequence": 110,
-                    "vertexType": "TRANSIT"
-                },
-                "legGeometry": {
-                    "points": "_rqaGz_vpLPOROtHkG`CuCh@g@b@W??FCZQr@GlMg@zG@??R?vC?P@TN`ElDvAvBdBrBrA~A??@@t@r@hAtAjDdDb@d@t@r@TJj@Lj@@l@Bz@H@?P@fD`@|B^XJRLx@`AzBvB^F",
-                    "length": 43
-                },
-                "routeLongName": "Orange Line",
-                "rentedBike": false,
-                "transitLeg": true,
-                "duration": 540.0,
-                "intermediateStops": [{
-                    "name": "Haymarket - Orange Line Inbound",
-                    "gtfsId": "1:70024",
-                    "stopCode": "70024",
-                    "lon": -71.05829,
-                    "lat": 42.363021,
-                    "arrival": 1495216860000,
-                    "departure": 1495216860000,
-                    "stopIndex": 7,
-                    "stopSequence": 70,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "State Street - to Forest Hills",
-                    "gtfsId": "1:70022",
-                    "stopCode": "70022",
-                    "lon": -71.057598,
-                    "lat": 42.358978,
-                    "arrival": 1495216980000,
-                    "departure": 1495216980000,
-                    "stopIndex": 8,
-                    "stopSequence": 80,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "Downtown Crossing - to Forest Hills",
-                    "gtfsId": "1:70020",
-                    "stopCode": "70020",
-                    "lon": -71.060225,
-                    "lat": 42.355518000000004,
-                    "arrival": 1495217100000,
-                    "departure": 1495217100000,
-                    "stopIndex": 9,
-                    "stopSequence": 90,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "Chinatown - Outbound",
-                    "gtfsId": "1:70018",
-                    "stopCode": "70018",
-                    "lon": -71.062752,
-                    "lat": 42.352547,
-                    "arrival": 1495217220000,
-                    "departure": 1495217220000,
-                    "stopIndex": 10,
-                    "stopSequence": 100,
-                    "vertexType": "TRANSIT"
-                }],
-                "steps": []
-            }, {
-                "startTime": 1495217281000,
-                "endTime": 1495217539000,
-                "departureDelay": 0,
-                "arrivalDelay": 0,
-                "realTime": false,
-                "distance": 329.314,
-                "pathway": false,
-                "mode": "WALK",
-                "route": {
-                    "gtfsId": "1:Orange",
-                    "longName": "Orange Line"
-                },
-                "trip": {
-                    "gtfsId": "1:33932854"
-                },
-                "agencyTimeZoneOffset": -14400000,
-                "interlineWithPreviousLeg": false,
-                "from": {
-                    "name": "Tufts Medical Center - Outbound",
-                    "stop": {
-                        "gtfsId": "1:70016"
-                    },
-                    "lon": -71.063917,
-                    "lat": 42.349662,
-                    "arrival": 1495217280000,
-                    "departure": 1495217281000,
-                    "stopIndex": 11,
-                    "stopSequence": 110,
-                    "vertexType": "TRANSIT"
-                },
-                "to": {
-                    "name": "Destination",
-                    "lon": -71.066481,
-                    "lat": 42.348777,
-                    "arrival": 1495217539000,
-                    "orig": "",
-                    "vertexType": "NORMAL"
-                },
-                "legGeometry": {
-                    "points": "clnaGvsvpL@?ZNF@\\Jr@NdB\\PDARa@vF[zD",
-                    "length": 11
-                },
-                "rentedBike": false,
-                "transitLeg": false,
-                "duration": 258.0,
-                "intermediateStops": [],
-                "steps": [{
-                    "distance": 138.02,
-                    "relativeDirection": "DEPART",
-                    "streetName": "Washington Street",
-                    "absoluteDirection": "SOUTH",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.06379006319844,
-                    "lat": 42.34962271200275,
-                    "elevation": []
-                }, {
-                    "distance": 111.909,
-                    "relativeDirection": "RIGHT",
-                    "streetName": "Oak Street West",
-                    "absoluteDirection": "WEST",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.064203,
-                    "lat": 42.348421800000004,
-                    "elevation": []
-                }, {
-                    "distance": 79.385,
-                    "relativeDirection": "CONTINUE",
-                    "streetName": "Tremont Street",
-                    "absoluteDirection": "WEST",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.06554100000001,
-                    "lat": 42.348609,
-                    "elevation": []
-                }]
-            }],
-            "tooSloped": false
-        }, {
-            "duration": 800,
-            "startTime": 1495217219000,
-            "endTime": 1495218019000,
-            "walkTime": 258,
-            "transitTime": 540,
-            "waitingTime": 2,
-            "walkDistance": 329.35159398374935,
-            "walkLimitExceeded": false,
-            "elevationLost": 0.0,
-            "elevationGained": 0.0,
-            "transfers": 0,
-            "legs": [{
-                "startTime": 1495217220000,
-                "endTime": 1495217760000,
-                "departureDelay": 0,
-                "arrivalDelay": 0,
-                "realTime": false,
-                "distance": 1995.478514770973,
-                "pathway": false,
-                "mode": "SUBWAY",
-                "route": {
-                    "gtfsId": "1:Orange",
-                    "longName": "Orange Line"
-                },
-                "trip": {
-                    "gtfsId": "1:33932855"
-                },
-                "agencyName": "MBTA",
-                "agencyUrl": "http://www.mbta.com",
-                "agencyTimeZoneOffset": -14400000,
-                "routeColor": "E87200",
-                "routeType": 1,
-                "routeTextColor": "FFFFFF",
-                "interlineWithPreviousLeg": false,
-                "tripBlockId": "O903_-15",
-                "headsign": "Forest Hills",
-                "agencyId": "1",
-                "serviceDate": "20170519",
-                "from": {
-                    "name": "North Station - Orange Line Inbound",
-                    "stopId": "1:70026",
-                    "stopCode": "70026",
-                    "lon": -71.06129,
-                    "lat": 42.365577,
-                    "departure": 1495217220000,
-                    "orig": "stop North Station ",
-                    "stopIndex": 6,
-                    "stopSequence": 60,
-                    "vertexType": "TRANSIT"
-                },
-                "to": {
-                    "name": "Tufts Medical Center - Outbound",
-                    "stop": {
-                        "gtfsId": "1:70016"
-                    },
-                    "lon": -71.063917,
-                    "lat": 42.349662,
-                    "arrival": 1495217760000,
-                    "departure": 1495217761000,
-                    "stopIndex": 11,
-                    "stopSequence": 110,
-                    "vertexType": "TRANSIT"
-                },
-                "legGeometry": {
-                    "points": "_rqaGz_vpLPOROtHkG`CuCh@g@b@W??FCZQr@GlMg@zG@??R?vC?P@TN`ElDvAvBdBrBrA~A??@@t@r@hAtAjDdDb@d@t@r@TJj@Lj@@l@Bz@H@?P@fD`@|B^XJRLx@`AzBvB^F",
-                    "length": 43
-                },
-                "routeLongName": "Orange Line",
-                "rentedBike": false,
-                "transitLeg": true,
-                "duration": 540.0,
-                "intermediateStops": [{
-                    "name": "Haymarket - Orange Line Inbound",
-                    "gtfsId": "1:70024",
-                    "stopCode": "70024",
-                    "lon": -71.05829,
-                    "lat": 42.363021,
-                    "arrival": 1495217340000,
-                    "departure": 1495217340000,
-                    "stopIndex": 7,
-                    "stopSequence": 70,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "State Street - to Forest Hills",
-                    "gtfsId": "1:70022",
-                    "stopCode": "70022",
-                    "lon": -71.057598,
-                    "lat": 42.358978,
-                    "arrival": 1495217460000,
-                    "departure": 1495217460000,
-                    "stopIndex": 8,
-                    "stopSequence": 80,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "Downtown Crossing - to Forest Hills",
-                    "gtfsId": "1:70020",
-                    "stopCode": "70020",
-                    "lon": -71.060225,
-                    "lat": 42.355518000000004,
-                    "arrival": 1495217580000,
-                    "departure": 1495217580000,
-                    "stopIndex": 9,
-                    "stopSequence": 90,
-                    "vertexType": "TRANSIT"
-                }, {
-                    "name": "Chinatown - Outbound",
-                    "gtfsId": "1:70018",
-                    "stopCode": "70018",
-                    "lon": -71.062752,
-                    "lat": 42.352547,
-                    "arrival": 1495217700000,
-                    "departure": 1495217700000,
-                    "stopIndex": 10,
-                    "stopSequence": 100,
-                    "vertexType": "TRANSIT"
-                }],
-                "steps": []
-            }, {
-                "startTime": 1495217761000,
-                "endTime": 1495218019000,
-                "departureDelay": 0,
-                "arrivalDelay": 0,
-                "realTime": false,
-                "distance": 329.314,
-                "pathway": false,
-                "mode": "WALK",
-                "route": {
-                    "gtfsId": "1:Orange",
-                    "longName": "Orange Line"
-                },
-                "trip": {
-                    "gtfsId": "1:33932856"
-                },
-                "agencyTimeZoneOffset": -14400000,
-                "interlineWithPreviousLeg": false,
-                "from": {
-                    "name": "Tufts Medical Center - Outbound",
-                    "stop": {
-                        "gtfsId": "1:70016"
-                    },
-                    "lon": -71.063917,
-                    "lat": 42.349662,
-                    "arrival": 1495217760000,
-                    "departure": 1495217761000,
-                    "stopIndex": 11,
-                    "stopSequence": 110,
-                    "vertexType": "TRANSIT"
-                },
-                "to": {
-                    "name": "Destination",
-                    "lon": -71.066481,
-                    "lat": 42.348777,
-                    "arrival": 1495218019000,
-                    "orig": "",
-                    "vertexType": "NORMAL"
-                },
-                "legGeometry": {
-                    "points": "clnaGvsvpL@?ZNF@\\Jr@NdB\\PDARa@vF[zD",
-                    "length": 11
-                },
-                "rentedBike": false,
-                "transitLeg": false,
-                "duration": 258.0,
-                "intermediateStops": [],
-                "steps": [{
-                    "distance": 138.02,
-                    "relativeDirection": "DEPART",
-                    "streetName": "Washington Street",
-                    "absoluteDirection": "SOUTH",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.06379006319844,
-                    "lat": 42.34962271200275,
-                    "elevation": []
-                }, {
-                    "distance": 111.909,
-                    "relativeDirection": "RIGHT",
-                    "streetName": "Oak Street West",
-                    "absoluteDirection": "WEST",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.064203,
-                    "lat": 42.348421800000004,
-                    "elevation": []
-                }, {
-                    "distance": 79.385,
-                    "relativeDirection": "CONTINUE",
-                    "streetName": "Tremont Street",
-                    "absoluteDirection": "WEST",
-                    "stayOn": false,
-                    "area": false,
-                    "bogusName": false,
-                    "lon": -71.06554100000001,
-                    "lat": 42.348609,
-                    "elevation": []
-                }]
-            }],
-            "tooSloped": false
-        }]
-    },
-    "debugOutput": {
-        "precalculationTime": 28,
-        "pathCalculationTime": 16,
-        "pathTimes": [5, 6, 4],
-        "renderingTime": 0,
-        "totalTime": 44,
-        "timedOut": false
-    },
-    "elevationMetadata": {
-        "ellipsoidToGeoidDifference": -29.913641103082842,
-        "geoidElevation": false
+                {
+                    "accessibilityScore": 1,
+                    "startTime": 1706813940000,
+                    "endTime": 1706815006000,
+                    "duration": 1066,
+                    "legs": [
+                        {
+                            "mode": "SUBWAY",
+                            "startTime": 1706813940000,
+                            "endTime": 1706814300000,
+                            "distance": 1611.49,
+                            "duration": 360,
+                            "intermediateStops": [
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMDI0",
+                                    "gtfsId": "mbta-ma-us:70024",
+                                    "name": "Haymarket",
+                                    "desc": "Haymarket - Orange Line - Forest Hills",
+                                    "lat": 42.363021,
+                                    "lon": -71.05829,
+                                    "code": "70024",
+                                    "locationType": "STOP"
+                                },
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMDIy",
+                                    "gtfsId": "mbta-ma-us:70022",
+                                    "name": "State",
+                                    "desc": "State - Orange Line - Forest Hills",
+                                    "lat": 42.358978,
+                                    "lon": -71.057598,
+                                    "code": "70022",
+                                    "locationType": "STOP"
+                                },
+                                {
+                                    "id": "U3RvcDptYnRhLW1hLXVzOjcwMDIw",
+                                    "gtfsId": "mbta-ma-us:70020",
+                                    "name": "Downtown Crossing",
+                                    "desc": "Downtown Crossing - Orange Line - Forest Hills",
+                                    "lat": 42.355518,
+                                    "lon": -71.060225,
+                                    "code": "70020",
+                                    "locationType": "STOP"
+                                }
+                            ],
+                            "transitLeg": true,
+                            "headsign": "Forest Hills",
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": {
+                                "gtfsId": "mbta-ma-us:1",
+                                "name": "MBTA",
+                                "url": "http://www.mbta.com"
+                            },
+                            "alerts": [
+                                {
+                                    "id": "QWxlcnQ6bWJ0YS1tYS11czo1NDgzNjY",
+                                    "alertHeaderText": "State Elevator 974 (Bowdoin platform to Congress Street, 60 State Street) unavailable",
+                                    "alertDescriptionText": "To exit, travel down the nearby ramp to the Orange Line Oak Grove platform, turn left, then use State Elevator 967 or 802 to access the Wonderland platform. Continue along the Wonderland platform to the 53 State St lobby and use State Elevator 975 to access the street. To board, cross State St, then proceed to the station entrance at 53 State St and use State Elevator 975 to access the Wonderland platform. At the Wonderland platform, turn left and proceed to the end of the platform (follow signs for Orange Line and Government Center/Bowdoin) and use State Elevator 967 or 802 to access the Orange Line Oak Grove platform. At the Oak Grove platform, turn right and travel up the nearby ramp to the Blue Line Bowdoin platform."
+                                }
+                            ],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "North Station",
+                                "lat": 42.36528,
+                                "lon": -71.060205,
+                                "departureTime": 1706813940000,
+                                "arrivalTime": 1706813940000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70026"
+                                }
+                            },
+                            "to": {
+                                "name": "Chinatown",
+                                "lat": 42.352547,
+                                "lon": -71.062752,
+                                "departureTime": 1706814300000,
+                                "arrivalTime": 1706814300000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70018"
+                                }
+                            },
+                            "route": {
+                                "gtfsId": "mbta-ma-us:Orange",
+                                "longName": "Orange Line",
+                                "shortName": null,
+                                "desc": "Rapid Transit",
+                                "color": "ED8B00",
+                                "textColor": "FFFFFF"
+                            },
+                            "trip": {
+                                "gtfsId": "mbta-ma-us:60455420"
+                            },
+                            "steps": [],
+                            "legGeometry": {
+                                "points": "inqaGr|upLdFcE`CuCh@g@b@W??FC??ZQr@GlMg@zG@????R?vC?P@TN`ElDvAvBdBrBrA|A???@@@t@r@hAtAjDdDb@d@t@r@TJj@Lj@@l@Bz@H@?"
+                            }
+                        },
+                        {
+                            "mode": "WALK",
+                            "startTime": 1706814300000,
+                            "endTime": 1706815006000,
+                            "distance": 663.55,
+                            "duration": 706,
+                            "intermediateStops": null,
+                            "transitLeg": false,
+                            "headsign": null,
+                            "realTime": false,
+                            "realtimeState": null,
+                            "agency": null,
+                            "alerts": [],
+                            "fareProducts": [],
+                            "from": {
+                                "name": "Chinatown",
+                                "lat": 42.352547,
+                                "lon": -71.062752,
+                                "departureTime": 1706814300000,
+                                "arrivalTime": 1706814300000,
+                                "stop": {
+                                    "gtfsId": "mbta-ma-us:70018"
+                                }
+                            },
+                            "to": {
+                                "name": "Park Plaza",
+                                "lat": 42.348777,
+                                "lon": -71.066481,
+                                "departureTime": 1706815006000,
+                                "arrivalTime": 1706815006000,
+                                "stop": null
+                            },
+                            "route": null,
+                            "trip": null,
+                            "steps": [
+                                {
+                                    "distance": 37.8,
+                                    "streetName": "Washington Street, Essex Street, Silver Line - SL4/SL5",
+                                    "lat": 42.352547,
+                                    "lon": -71.062752,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "FOLLOW_SIGNS",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 0,
+                                    "streetName": "pathway",
+                                    "lat": 42.352547,
+                                    "lon": -71.062752,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "CONTINUE",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 31.24,
+                                    "streetName": "Elevator",
+                                    "lat": 42.352547,
+                                    "lon": -71.062752,
+                                    "absoluteDirection": "SOUTHWEST",
+                                    "relativeDirection": "FOLLOW_SIGNS",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 0,
+                                    "streetName": "pathway",
+                                    "lat": 42.352456,
+                                    "lon": -71.062935,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 0,
+                                    "streetName": "Chinatown - Washington St, Essex St",
+                                    "lat": 42.352405,
+                                    "lon": -71.063087,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "EXIT_STATION",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 21.24,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3523918,
+                                    "lon": -71.0630844,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 5.15,
+                                    "streetName": "alley",
+                                    "lat": 42.352366,
+                                    "lon": -71.0633404,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 66.2,
+                                    "streetName": "Boylston Street",
+                                    "lat": 42.3523198,
+                                    "lon": -71.0633365,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 5.56,
+                                    "streetName": "Tamworth Street",
+                                    "lat": 42.3523286,
+                                    "lon": -71.064141,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 26.87,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3522791,
+                                    "lon": -71.0641506,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 2.23,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3522948,
+                                    "lon": -71.0644769,
+                                    "absoluteDirection": "SOUTHWEST",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 6.77,
+                                    "streetName": "path",
+                                    "lat": 42.3522808,
+                                    "lon": -71.0644964,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 153.18,
+                                    "streetName": "Tremont Street",
+                                    "lat": 42.3522924,
+                                    "lon": -71.0645773,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 11.88,
+                                    "streetName": "path",
+                                    "lat": 42.3509454,
+                                    "lon": -71.0649625,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": false
+                                },
+                                {
+                                    "distance": 181.29,
+                                    "streetName": "sidewalk",
+                                    "lat": 42.3509172,
+                                    "lon": -71.065102,
+                                    "absoluteDirection": "SOUTH",
+                                    "relativeDirection": "LEFT",
+                                    "stayOn": true
+                                },
+                                {
+                                    "distance": 114.15,
+                                    "streetName": "path",
+                                    "lat": 42.3493161,
+                                    "lon": -71.0655133,
+                                    "absoluteDirection": "WEST",
+                                    "relativeDirection": "RIGHT",
+                                    "stayOn": true
+                                }
+                            ],
+                            "legGeometry": {
+                                "points": "k~naGfmvpL????Pb@????H\\????@?Bb@@NHA@^Ad@?NAZ?n@H@C~@@BANz@Nt@LLBTDH@PDh@JTHZFDZt@ND@B?|@RD?F@VFr@JfBT?FBJDPHPFNFJBLBJ@L?P?TVBDBP?BAJT"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
     }
 }
diff --git a/test/trip_plan/itinerary_test.exs b/test/trip_plan/itinerary_test.exs
index 5a1cfa0c8f..3fe6e7d977 100644
--- a/test/trip_plan/itinerary_test.exs
+++ b/test/trip_plan/itinerary_test.exs
@@ -1,22 +1,33 @@
 defmodule TripPlan.ItineraryTest do
   use ExUnit.Case, async: true
+  import Test.Support.Factory
   import TripPlan.Itinerary
-  alias TripPlan.{TransitDetail, Api.MockPlanner, Leg, PersonalDetail, TransitDetail}
+  alias TripPlan.{TransitDetail, Leg, PersonalDetail, TransitDetail}
 
-  @from MockPlanner.random_stop()
-  @to MockPlanner.random_stop()
-  @connection_opts [user_id: 1]
+  @from build(:stop_named_position)
+  @to build(:stop_named_position)
 
   describe "destination/1" do
     test "returns the final destination of the itinerary" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
+      itinerary =
+        build(:itinerary,
+          legs: [
+            build(:leg, from: @from, to: @to, mode: build(:transit_detail))
+          ]
+        )
+
       assert destination(itinerary) == @to
     end
   end
 
   describe "transit_legs/1" do
     test "returns all transit legs excluding personal legs" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
+      itinerary =
+        build(:itinerary,
+          legs: [
+            build(:leg, from: @from, to: @to, mode: build(:transit_detail))
+          ]
+        )
 
       assert Enum.all?(transit_legs(itinerary), &Leg.transit?/1)
     end
@@ -24,7 +35,12 @@ defmodule TripPlan.ItineraryTest do
 
   describe "route_ids/1" do
     test "returns all the route IDs from the itinerary" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
+      itinerary =
+        build(:itinerary,
+          legs: [
+            build(:leg, from: @from, to: @to, mode: build(:transit_detail))
+          ]
+        )
 
       test_calculated_ids =
         Enum.flat_map(itinerary, fn leg ->
@@ -40,7 +56,12 @@ defmodule TripPlan.ItineraryTest do
 
   describe "trip_ids/1" do
     test "returns all the trip IDs from the itinerary" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
+      itinerary =
+        build(:itinerary,
+          legs: [
+            build(:leg, from: @from, to: @to, mode: build(:transit_detail))
+          ]
+        )
 
       test_calculated_ids =
         Enum.flat_map(itinerary, fn leg ->
@@ -56,7 +77,12 @@ defmodule TripPlan.ItineraryTest do
 
   describe "route_trip_ids/1" do
     test "returns all the route and trip IDs from the itinerary" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
+      itinerary =
+        build(:itinerary,
+          legs: [
+            build(:leg, from: @from, to: @to, mode: build(:transit_detail))
+          ]
+        )
 
       test_calculated_ids =
         Enum.flat_map(itinerary.legs, fn leg ->
@@ -72,7 +98,11 @@ defmodule TripPlan.ItineraryTest do
 
   describe "positions/1" do
     test "returns all named positions for the itinerary" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
+      itinerary =
+        build(:itinerary,
+          legs: build_list(3, :leg, from: @from, to: @to)
+        )
+
       [first, second, third] = itinerary.legs
       expected = [first.from, first.to, second.from, second.to, third.from, third.to]
       assert positions(itinerary) == expected
@@ -81,7 +111,12 @@ defmodule TripPlan.ItineraryTest do
 
   describe "stop_ids/1" do
     test "returns all the stop IDs from the itinerary" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
+      itinerary =
+        build(:itinerary,
+          legs: [
+            build(:leg, from: @from, to: @to, mode: build(:transit_detail))
+          ]
+        )
 
       test_calculated_ids =
         Enum.uniq(Enum.flat_map(itinerary.legs, &[&1.from.stop_id, &1.to.stop_id]))
@@ -106,25 +141,6 @@ defmodule TripPlan.ItineraryTest do
     end
   end
 
-  describe "same_itinerary?" do
-    test "Same itinerary is the same" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
-      assert same_itinerary?(itinerary, itinerary)
-    end
-
-    test "itineraries with different start times are not the same" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
-      later_itinerary = %{itinerary | start: Timex.shift(itinerary.start, minutes: 40)}
-      refute same_itinerary?(itinerary, later_itinerary)
-    end
-
-    test "Itineraries with different accessibility flags are the same" do
-      {:ok, [itinerary]} = MockPlanner.plan(@from, @to, @connection_opts, [])
-      accessible_itinerary = %{itinerary | accessible?: true}
-      assert same_itinerary?(itinerary, accessible_itinerary)
-    end
-  end
-
   describe "intermediate_stop_ids" do
     test "returns intermediate stop ids if the leg is transit detail and has them" do
       itinerary = %TripPlan.Itinerary{
diff --git a/test/trip_plan/leg_test.exs b/test/trip_plan/leg_test.exs
index e3855c41c9..ac68e5b491 100644
--- a/test/trip_plan/leg_test.exs
+++ b/test/trip_plan/leg_test.exs
@@ -1,67 +1,139 @@
 defmodule TripPlan.LegTest do
   use ExUnit.Case, async: true
   import TripPlan.Leg
-  alias TripPlan.Api.MockPlanner
 
-  @from MockPlanner.random_stop()
-  @to MockPlanner.random_stop()
+  @from Test.Support.Factory.build(:stop_named_position)
+  @to Test.Support.Factory.build(:stop_named_position)
   @start ~N[2017-01-01T00:00:00]
   @stop ~N[2017-01-01T23:59:59]
 
   describe "route_id/1" do
     test "returns {:ok, id} for a transit leg" do
-      transit_leg = MockPlanner.transit_leg(@from, @to, @start, @stop)
+      transit_leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:transit_detail)
+        )
+
       route_id = transit_leg.mode.route_id
       assert {:ok, ^route_id} = route_id(transit_leg)
     end
 
     test "returns :error for a personal leg" do
-      personal_leg = MockPlanner.personal_leg(@from, @to, @start, @stop)
+      personal_leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:personal_detail)
+        )
+
       assert :error = route_id(personal_leg)
     end
   end
 
   describe "trip_id/1" do
     test "returns {:ok, id} for a transit leg" do
-      transit_leg = MockPlanner.transit_leg(@from, @to, @start, @stop)
+      transit_leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:transit_detail)
+        )
+
       trip_id = transit_leg.mode.trip_id
       assert {:ok, ^trip_id} = trip_id(transit_leg)
     end
 
     test "returns :error for a personal leg" do
-      personal_leg = MockPlanner.personal_leg(@from, @to, @start, @stop)
+      personal_leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:personal_detail)
+        )
+
       assert :error = trip_id(personal_leg)
     end
   end
 
   describe "stop_ids/1" do
     test "returns the stop IDs @from and @to" do
-      transit_leg = MockPlanner.transit_leg(@from, @to, @start, @stop)
+      transit_leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:transit_detail)
+        )
+
       assert [@from.stop_id, @to.stop_id] == stop_ids(transit_leg)
     end
 
     test "ignores nil stop IDs" do
       from = %{@from | stop_id: nil}
-      personal_leg = MockPlanner.personal_leg(from, @to, @start, @stop)
+
+      personal_leg =
+        Test.Support.Factory.build(:leg,
+          from: from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:personal_detail)
+        )
+
       assert [@to.stop_id] == stop_ids(personal_leg)
     end
   end
 
   describe "transit?/1" do
     test "Returns true for transit leg" do
-      transit_leg = MockPlanner.transit_leg(@from, @to, @start, @stop)
+      transit_leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:transit_detail)
+        )
+
       assert transit?(transit_leg)
     end
 
     test "Returns false for personal leg" do
-      personal_leg = MockPlanner.personal_leg(@from, @to, @start, @stop)
+      personal_leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:personal_detail)
+        )
+
       refute transit?(personal_leg)
     end
   end
 
   describe "is_fare_complete_transit_leg?/1" do
     test "returns false for commuter rail routes between stops without commuter rail zone information" do
-      leg = MockPlanner.transit_leg(@from, @to, @start, @stop)
+      leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:transit_detail)
+        )
+
       assert is_fare_complete_transit_leg?(leg)
 
       bad_leg = %TripPlan.Leg{
@@ -81,28 +153,17 @@ defmodule TripPlan.LegTest do
     end
   end
 
-  describe "same_leg?/1" do
-    test "same_legs are the same" do
-      leg = MockPlanner.transit_leg(@from, @to, @start, @stop)
-      assert same_leg?(leg, leg)
-    end
-
-    test "same_legs with different steps are the same" do
-      leg = MockPlanner.personal_leg(@from, @to, @start, @stop)
-      modified_leg = %{leg | mode: %{leg.mode | steps: ["different personal steps"]}}
-      assert same_leg?(leg, modified_leg)
-    end
-
-    test "legs with different to and from are different" do
-      leg = MockPlanner.personal_leg(@from, @to, @start, @stop)
-      different_leg = %{leg | from: %{leg.from | name: "New name"}}
-      refute same_leg?(leg, different_leg)
-    end
-  end
-
   describe "stop_is_silver_line_airport?/2" do
     test "stop is not the Silver Line" do
-      leg = MockPlanner.transit_leg(@from, @to, @start, @stop)
+      leg =
+        Test.Support.Factory.build(:leg,
+          from: @from,
+          to: @to,
+          start: @start,
+          stop: @stop,
+          mode: Test.Support.Factory.build(:transit_detail)
+        )
+
       assert stop_is_silver_line_airport?([leg], :from) == false
     end
 
diff --git a/test/trip_plan/trip_plan_test.exs b/test/trip_plan/trip_plan_test.exs
index 5cf12b4c0d..eaadc91e82 100644
--- a/test/trip_plan/trip_plan_test.exs
+++ b/test/trip_plan/trip_plan_test.exs
@@ -10,20 +10,4 @@ defmodule TripPlanTest do
       assert_received {:geocoded_address, "address", {:ok, ^position}}
     end
   end
-
-  describe "plan/4" do
-    test "returns {:ok, itineraries} from the api" do
-      {:ok, from} = geocode("from")
-      {:ok, to} = geocode("to")
-      connection_opts = [user_id: 1]
-      opts = [depart_at: ~N[2017-07-06T19:20:00]]
-      assert {:ok, itineraries} = plan(from, to, connection_opts, opts)
-      assert [%TripPlan.Itinerary{}] = itineraries
-
-      assert_received {:planned_trip, {^from, ^to, ^connection_opts, received_opts},
-                       {:ok, ^itineraries}}
-
-      assert received_opts[:depart_at] == opts[:depart_at]
-    end
-  end
 end