wmap may have been left in an inconsistent state. @trosen-r7 has me push up my changes before I had time to review and spec some of these files so that he could start his work on Pro.