lots of stuff
fixed conflicts
yolo