Revert "Revert "WIP""

This reverts commit 65e7fdd34309941f41eba4af28661654c8bc6310.