Revert "Revert "Huge update""

This reverts commit 052b26a5e8c88c0dd2d70cd3a76a302d31d59887.