Revert "Revert "WPS Assignment""

This reverts commit 9c23e5df1a4cc111e759143dc58571cae48c83dd.