dodo commit, work in progress