Adition

I added what we talked about last week (plus some other stuff)