Proposed revamp of wd_s mu-plugins/plugins