Stuff
fix merge
Almost almost done