First merge attempt

Hope this works