DSI phase 3

❏ We may add events dev to overall work