DO-NOT-MERGE Refactor