GCW-Zero changes

Hello Christopho, I don't know if it interests you, but here's the gcw-zero changes I've done far now.