Revert "Removed a lot"

This reverts commit e50091e844494ece0257983df3d07597869c7c78.