Working on additional cases for maxopt.
Getting there with wdmgrating.