Merging

Hopefully will merge the branches