[WIP] Get rid of zIndexes pull