Fixed up requirement installation, still needs slimming down