Lots of stuff you should really merge ASAP please