Accidentally overwrote my refactor. Redid it.