Compilable 1.7 build :D