WIP
WIP
New internal datastructure
Added negated indicator support