I think I broke this whole thing with my last commit. Fix'd