Dev wed

This is what I *should* have done with the last merge.