/cc @benbjohnson Thoughts on this?