This really shouldn't have taken three commits...