Feature/190 proper dml

To review during our meeting.