Stuff
Merge commits and half DH implemented