cc @brson, just want to make sure that this looks good to you.