merge qcz editor early to help finish other editor parts