Pretty happy with this merge.