Completed merge of fluff and main
Adedd Enviorment