Revert "Revert "WIP""

This reverts commit 5fc2b0e2d67f214f5d343a834616c72ee44b179f.