DSI phase 3

In progress