Revert "Revert "Latest and greatest""

This reverts commit c9814fc02e8fd85c56f98050843d4c0b817572da.