Refactor some more ish.