Everything working
Merging