DO NOT MERGE! Testing refactoring.