I'm not sure if this follows expected style -- will defer to @pwendell on this one