Revert "Revert "Toolkit Assignment""

This reverts commit 89f187e3f821bbbe48ab23e1bc9b2045d823f6da.
Revert "Revert "Revert "Toolkit Assignment"""

This reverts commit 4287277c08cd4fe71fc124b4b54c627342cb1d42.