Added D2D skeleton
rolled back D2D, need to refactor some code first