@aarondav this actually isn't private in master... should it be?