I'll refactor this when I get to that.