Good call, will refactor.