[WIP] First pass of select mask