Revert "Revert "Add features back""

This reverts commit 7f022fc89b33156a0ac9fbd7fa3718c1736b9f5c.