Add alot of stuff and comments
Add alot of stuff and comments
Merge origin/master into new