Things added
Merge stuff