A few initial edits to make this our own...