A whole lota refactoring going on