WIP z index bug