Discovery of another data source has completely changed the project... again