A whole lot of streamlining that I hope didn't break things