Much refactor, such wow.