Updating to note the pull in of Rob Flaherty's work