Add TODOs to operator-enter, change name to operator-edge