Attempting to put my changes in @KittyTristy's pull.