#15 First refactor of coordinator to implement new drop handling alg. Build failing due to BC breakage of the data source protocol