diff --git a/src/AddressBook.tsx b/src/AddressBook.tsx
index 35dc2aa..cbdd7ac 100644
--- a/src/AddressBook.tsx
+++ b/src/AddressBook.tsx
@@ -5,12 +5,12 @@ import * as ICAL from 'ical.js';
 
 class AddressBook extends React.Component {
   props: {
-    entries: Map<string, ICAL.Component>,
+    entries: Array<ICAL.Component>,
     onItemClick: (contact: ICAL.Component) => void,
   };
 
   render() {
-    let entries = Array.from(this.props.entries.values()).sort((_a, _b) => {
+    let entries = this.props.entries.sort((_a, _b) => {
       const a = _a.getFirstPropertyValue('fn');
       const b = _b.getFirstPropertyValue('fn');
 
diff --git a/src/JournalAddressBook.tsx b/src/JournalAddressBook.tsx
index 32df51d..160b59c 100644
--- a/src/JournalAddressBook.tsx
+++ b/src/JournalAddressBook.tsx
@@ -5,6 +5,8 @@ import * as ICAL from 'ical.js';
 
 import * as EteSync from './api/EteSync';
 
+import { syncEntryToEntriesProps } from './journal-processors';
+
 import { routeResolver } from './App';
 
 import AddressBook from './AddressBook';
@@ -13,7 +15,7 @@ import Contact from './Contact';
 class JournalAddressBook extends React.Component {
   props: {
     journal: EteSync.Journal,
-    entries: Array<EteSync.SyncEntry>,
+    entries: Map<string, ICAL.Component>,
     history?: any,
   };
 
@@ -34,20 +36,7 @@ class JournalAddressBook extends React.Component {
       return (<div>Loading</div>);
     }
 
-    let items: Map<string, ICAL.Component> = new Map();
-
-    for (const syncEntry of this.props.entries) {
-      let comp = new ICAL.Component(ICAL.parse(syncEntry.content));
-
-      const uid = comp.getFirstPropertyValue('uid');
-
-      if ((syncEntry.action === EteSync.SyncEntryAction.Add) ||
-        (syncEntry.action === EteSync.SyncEntryAction.Change)) {
-        items.set(uid, comp);
-      } else if (syncEntry.action === EteSync.SyncEntryAction.Delete) {
-        items.delete(uid);
-      }
-    }
+    let items = this.props.entries;
 
     return (
       <div>
@@ -56,7 +45,7 @@ class JournalAddressBook extends React.Component {
             path={routeResolver.getRoute('journals._id')}
             exact={true}
             render={() => (
-                <AddressBook entries={items} onItemClick={this.contactClicked} />
+                <AddressBook entries={Array.from(items.values())} onItemClick={this.contactClicked} />
               )
             }
           />
@@ -76,4 +65,4 @@ class JournalAddressBook extends React.Component {
   }
 }
 
-export default withRouter(JournalAddressBook);
+export default syncEntryToEntriesProps(withRouter(JournalAddressBook));
diff --git a/src/journal-processors.tsx b/src/journal-processors.tsx
new file mode 100644
index 0000000..eaee353
--- /dev/null
+++ b/src/journal-processors.tsx
@@ -0,0 +1,36 @@
+import * as React from 'react';
+
+import * as ICAL from 'ical.js';
+
+import * as EteSync from './api/EteSync';
+
+// FIXME: Figure out how to correctly use the props type
+export function syncEntryToEntriesProps(WrappedComponent: any) {
+  return class extends React.Component {
+    props: any;
+
+    render() {
+      let items: Map<string, ICAL.Component> = new Map();
+
+      for (const syncEntry of this.props.entries) {
+        let comp = new ICAL.Component(ICAL.parse(syncEntry.content));
+
+        const uid = comp.getFirstPropertyValue('uid');
+
+        if ((syncEntry.action === EteSync.SyncEntryAction.Add) ||
+          (syncEntry.action === EteSync.SyncEntryAction.Change)) {
+          items.set(uid, comp);
+        } else if (syncEntry.action === EteSync.SyncEntryAction.Delete) {
+          items.delete(uid);
+        }
+      }
+
+      return (
+        <WrappedComponent
+          {...this.props}
+          entries={items}
+        />
+      );
+    }
+  };
+}