A lot of refactoring. Pivot???