Many changes
Wassup
Merge