More operator implementation. Mostly untested.