Add requirements
Backout craziness