Working on proper operator functionality