Begin work on DataPath merge