Continuing refactoring... disambiguate just a stub at this point