DO NOT REVERT: More refactoring/stubbing