Blake's review

[caryan]

@blakejohnson your comment reminded me of this branch hanging out. I've rebased off master so we can just merge it in before it gets left behind.

[blakejohnson]

@caryan thanks