Refactor and rescope some variables to accommodate how things will
work in "The Future"(tm)