Ugly commit, josh needs some of this