lots of weird stuff
merging