Revert "Revert "WIP""

This reverts commit ae12285cbb51e610a23c6ffec94156653480476d.