Looks good to me. Merge and revise in a commit. Nice work @westonruter!