Merge this branch for great justice

move zig move zig take off every zig