+ Complete rewrite of ORing, + Moved code onto token, + OR-combinations