Start of new Uber refactor.