Hopefully merged now!

Let's hope this compiles!