Moving things back into wmaddisn