Refactored in a big way.