diff --git a/src/Schedule/FeedbackLink.jsx b/src/Schedule/FeedbackLink.jsx
new file mode 100644
index 0000000..1d774d9
--- /dev/null
+++ b/src/Schedule/FeedbackLink.jsx
@@ -0,0 +1,3 @@
+export default function FeedbackLink(event) {
+    return (<a href={event.feedback_url}>Submit feedback</a>);
+}
diff --git a/src/Schedule/Speaker.jsx b/src/Schedule/Speaker.jsx
new file mode 100644
index 0000000..7001852
--- /dev/null
+++ b/src/Schedule/Speaker.jsx
@@ -0,0 +1,15 @@
+import { getSpeakerName } from './utils.js';
+import PropTypes from 'prop-types';
+
+export default function Speaker(speaker) {
+    return (<>
+        <a href={'#'.concat(getSpeakerName(speaker))}>{getSpeakerName(speaker)}</a>
+        {speaker.organisation && <>/&#8288;{speaker.organisation}&#8288;/</>}
+    </>);
+}
+
+Speaker.propTypes = {
+    first_name: PropTypes.string.isRequired,
+    last_name: PropTypes.string.isRequired,
+    organisation: PropTypes.string,
+};