Made an Operator enum, modified Expression to fit