merging with doresol_intro

in progress