Working on environmental hazards (NOTE: nowhere near done; don't change anything, I am going to continue working on this
Merge origin/master