improved variable names so we distinguish ObjectProvider (op) and
Operation (oper). Add 2 TODOs and remove 1 TODO