Refactored and renamed. Now that we're going to expand, we need to be a little cleaner.