Continuing to get fucked by a refactor.