starting to merge whirm/dispersy devel