More cleanup
More fixed tests
all the tests working again
New operator model