bah! i gotta commit this too