wip
Merge branch 'dp_bins'
misc