working commit with n2o_sample, next step, to rename