Just a remark, we should use ```final``` on classes as much as possible in the future. I might have missed a few too, but once the operators have been reimplemented, we can make cleanup pass.