Refactoring commit. HUGE commit.