Done. Want to take a final look before this gets merged?