Revert "Revert "[WIP] Hybrid 3.0""

This reverts commit d3b6f6df32abbf061ca8dd18f0e5f82438f73c65.