Topic/operators

The remaining tests have succeeded, I'm quite confident now that this implementation is a good choice.
} else {