Added second half of operator shelf WIP