Refactoring how peers are distributed. Breaks build :X