Revert "Revert "WIP""

This reverts commit 95e3b6d5293461b9646e92d93391e882315faac4.