bit more z stuff, don't expect to compile for a while now..